Revert "Revert "Initial draft v0.9""

This reverts commit 355565e079c4a9fac73d912c46a2d6b82faebec9.
lib as well