Big rewrite.  Looking good.