solved some routing issues, still need to fix more better