Structure overhaul and Player class added