Factored out all the legacy roadmap stuff.

Also made a number of tweaks.