Plugged the new deferred views in.

The router is getting a bit icky again, definitely needs tests and some
refactoring.