Rewriting...

Kind-of a drains-up rewrite...