BROKEN - initial separation of store into separate module