added new controller and testing stuff