reverts master branch to previous mucked up controller because it works