Left TODOs about the performance improvements.  Abandoned single pass.