more work on routing, initial work on navigation