Trying to merge my Player class into this...