Made a new Control class. This one is an abstraction of the previous. Multiple Controls can be defined, etc. Uses different syntax.
Merge remote-tracking branch 'upstream/master'