update all pull request into one refactor

[aboe76]

In this refacor I have merged all the following PR's:

• 8

• 17

• 20

• 22

• 24

[aboe76]

@noelmcloughlin lets merge it first and then clean up the readme.

[noelmcloughlin]

Thanks for this @aboe76 LTGM