Remove player

GOt the unit tests ironed out.  Just need to make sure the merge won't destroy everything.