Reorganize Player class
Move things into a gamestate