- more work on rethinkdb transition