Revert "v0.2 continued some more"

This reverts commit 3b27e0733092418095f2379a3c1e21531b45ed91.
Revert "Revert "v0.2 continued some more""

This reverts commit 2a0ff3e291f64ef6a195a373b145c8a14b3272e1.