90% done with migration to inmem db