Initial checkin to support couchrest