WIP - Refactoring Controls