Add TODO
Begin route handling