converted conroller objects to Marionette Controller, also re-added fast switching method for testing