Refactor

Begins transition to new control scheme and display