Move more stuff to System
Merge pull request #4 from andystanton/add-playable-controls

Move more stuff to System