update everything
Made a start with everything
Closes #23
Merge pull request #24 from wudoict/development

Development