WIP

All green but one last concurrent mod exception.  Uck.