4ae2348 adding some more redirects and todos