added keycombos, renamed controller.py to gamepad.py, made progress