Revert "Initial draft"

This reverts commit b96414f210c39ae55bb7bf561b2c852e83c70e98.
Revert "Revert "Initial draft""

This reverts commit 3362300e70164938ae6390a8f045f8290b9804e0.