Initial progress in adding controls