Unjunk Thing OOP, remove Player class, add Map class