Moved player into a base class