Rearranged the controller, and added the ability to use other numbers than the defaults