In the middle of rethinking how modal windows should work...
Moving player movement to the Player object, to make collision checks a bit more generic.