WIP
Merge pull request #20 from LouisaBarrett/refactor

WIP