Lots of rework for better scalability.  Incompatible DB structural
changes!