Fixed todo to include change to couchdb