Initial work on control system (WIP)