Feat/serverroutes

Resubmit pull request that was closed for some reason.