Added routing
Now does dynamic routing
test