All map tests are working, and all maps are in.  (With some commented-out bugs.)