First round of custom storage complete.  Compiles.  Now need to test.