Added methods to Entity, made Player extend Entity