Initial draft v0.9

Demo ready code
Revert "Initial draft v0.9"

This reverts commit 6b58b30210c58d4130a905b95ba2ef827a0e6ad1.