Cleaning up and starting to stub out how controls will be added