Completely redoing all of the controller actions now to make this work... very scary