added todos for making couchbase optional