Revert "Revert "Proposal""

This reverts commit 1e4def35dea5415a02e8d809af58ef9f2b0f4da0.