The whole game seems to work now.  Needs more testing