mayor routing overhaul, please don't break