[DO NOT MERGE] On-going module refactor#61

Open

PaulKinlan wants to merge 2 commits intoproductionfrom module

Commits on Apr 13, 2019

First major refactoring
PaulKinlan
committed

Commits on Jul 13, 2019

Adding some smaller changes.
PaulKinlan
committed