Add Redirects instead of //TODO