Added some relational routing, need to clean up routing and other stuff