Revert "Revert "really really close to 0.0.1""

This reverts commit 0b8725eae7103ad40f037202ab95507850e3cba1.