Added comment toggle support

Hi Brandon -- Added comment toggle support...

Cheers!

  -- Matt