Cleanup of control code

[NogginBops]

The goal of this PR is to remove some layers of complexity from the control by both removing some of the bad abstractions introduced as well as introduce diligent error checking which will aid immensely with further development of the control.