more refactoring, still need to fix the regression...
fixed the regression!  On with refactoring GameState...