Refactoring v1
Merge pull request #3 from amsterdamhackathon/henry

Refactoring v1