Updated player and GameWindow - room on it's way

hopefully this doesn't have merge conflicts