Add redirection. Fully functional (but glitchy)