Now with tests in place...

I'm starting to see/realize the funky bits off how I was thinking Player
class should work, and cleaning them up.