Revert "Revert "A few more comments on what to do""

This reverts commit 26667459c493f200ce4b0a7e51c906aaaafd2a57.