Add controls and control logic