More work on design, added caching
Working on saving data to CouchDB