Started implementing route lookup