wip, routing issue

The tests need to be updated or thr routes need to be changed.