Whoops…broke that. Left some experimental code in there
Make routing a little friendlier