Tidy up my main routine a little bit.
Collapse the storage repo types and instantiate out in main.
Mark out where I'm gonna put the persistent storage.