Quarter way through first draft of storage handler