Revert "fully functional draft"

This reverts commit cd08583c414c80a2fd40395e87bfefaee09a7e7f.
Revert "Revert "fully functional draft""

This reverts commit 7c6ce8457dee5173a5552c4822a77ca0393ee9d3.