Work in progress fixing broken routes.