building out better routing
cleaned up