Massive update: pretty much done with the bulk of the work.