We're persisting some data (#8) we should check if: - are we duplicating info? - are we saving extra data?
