EPD-127 and EPD-128: Move intended route functionality to new layer