Feature/cluster reroute

Closes #496