Revert "Initial WIP commit"

This reverts commit d20111530d94d08c28c28ecab1d91dcb0881ed2e.
Revert "Revert "Initial WIP commit""

This reverts commit 4a762095bdc0c2221666fc41d49f7de9e17579ec.