A good base of persistance data added

Persistance data being added to the datastore, but currently not being
deleted so be careful.  That is the next step, but provisionlal work on
caching is working well.