Redesigned player state machine; not sure if I quite like it this way...