Big commit after much CouchDB progress