Started adding controls