Internal Change. Use a global map instead of of a lot small ones.
First part of the FireWall pipe. Some bug fixes and cleanups.