work on DummyStorage to make it work fully