Add TODOs
Make router URL parsing more permissive