Misc hacking.  Introduce more grid sizes.  Need to fix waitForSetSize.