start adding routing support