Unit and Player Classes behave correctly now