progress on making couchbase optional, not complete