updated routing, merged tooling branch