Comment-update./
  Rewrote storage options as a class-factory and subclasses.

  This is much less nasty.