Merge pull request #5 from pmorie/build

Refactor
Merge pull request #6 from pmorie/build

Add integration tests for validate
Cleanup