Worked on #19. Uncommented the catch-all route to see if it was causing the redirect problem.