Added in much better routing for urls