mkirby: Updated controller code to have all currently decided on controls.