started merge api. pending: migrate code to entity framework 'look' and make all tests pass again