Adding routing (not really working all that well atm)