Started looking into Marionette, and started feeling a little constricted.  Probably just need to study it more.
Re-organizing things again.  I mentioned this is a bit of a learning experience right?