More comment work
Header, closes #31
Merge pull request #36 from peterwilsoncc/moles/components

Moles/components & Header