initial shot at adding redir support (hacky)