some pretty hacky fixes to tear the player object out of Player