Integrated with new controller in place. BUG: Two forms/buttons used for getting started