Revert "Revert "Manual draft 1 finished""

This reverts commit 49ac488e0830dd926713b74a371910a9ac35e8a5.