Added in more controls and things
Merge branch 'master' of github.com:interbred-monkey/amp