Redirect works well and added some niceness to it, getting ready to merge to master.