Started adding haddock comments, not done yet