working draft
Merge pull request #1 from mwaylabs/refactor

Add validation