Added game controller back

-might require more clean up