More work on the new controller method. Still not working, but does something not completely wrong.