Started rewrite, list
More rewriting
Rewrite final (mostly)