Running display rewrite.  Still janky.