Initial commit
Added validation