Started working on controls