Haypo req markers

Rebases @haypo's patch in #1472 and fixes a few small issues with it.

Closes #1472 and Fixes #1433