Completed first draft of  package and haddock docs