First commit of the actual control code