Continuing the big rewrite!
Further work on the rewrite.
Further work on rewrite.
Further rewrite work.