The giant rewrite, part 1 of ???