Add Proper Marionette Application and its wiring.
State fixes.