Add controller and start migrating control logic