What would be the best way to put draft comments in a rST document?

Ideally I'd like them rendered something like a LaTeX margin note or the equivalent construct as HTML (whatever that might be).

Also, they need to be able to turned on/off depended on whether I'm building in 'draft' mode or not.

I'm currently using sidebar, but want to know if there is a better way

Cheers,
Carl.