Made some of the controller logic more intuitive. Still some more work to do to minimize the logic in the controller