Added TODO for redirect stuff