Finished cleaning up player code and splitting it into two separate classes.