Rolled back to "Fixed controls not working"
Last few commits introduced some crazy bugs, and 
the the commits weren't needed. A communication 
issue with a tester made me think there were bugs 
where there were none.