formalize storage a 'lil more, clearing the way for moar abstraction