working on routing again