New service discovery feature

Big refactoring of the way requests get routed