More controller work, not as much as I'd like

Down under 100: 99!
controllers WIP