Fixing some issues with routing, not finished but its a start.