0.9 WIP

Targeting 0.11.13, or before if we're comfortable with the stability.

Replaces #64