Started adding routeing