New wai warp

This is deployed to epsilon, please review and merge.