Refactored roadmap

In the light of discussions with Darren and EricD