refactoring, to move last-access components down to storemate