Finishing up the controller