working on controls
refactored controls access
Merge branch 'controls_refactor'