Did some stuff yesterday
make the tests pass
add custom validator
fix name
Merge pull request #13 from dmcguinness/feature/more-stuff

Feature/more stuff