Haddocks WIP

Untested.