Final push to Master

All the Control stuff. Not all of this works 100% so don't integrate it right away with other stuff. It is in a state of "mostly done" and will be used later on.