memstore simplification WIP