Improving the router and setting up a demo.