Add some more complex routing and begin using the models