Reconfigured variables.  Moved things to player class that belonged there.