Revving v0.0.2
flagged version 0.0.3-div
Expander: a lot of cleanup