Made Player.as class, and probably other changes too