More commits on the control side. WIP