Cleaned up routing madness. Works much more predictable now.