Almost done, native routing