Doing some serious moving things around.  Added Marionette because I think I will try it out.