Initial commit for phase 2, Add some simple validation.