Refactoring out couch stuff into its own module
Cleaning up couch and tests