working on proper routing