Initial pass on adding routing