Initial move of controls for Issue #77