Controls

Pulling Eliot's Changes to me