Added redirects, and then some