Adding first pass at persistence