Start work on validate

Change-Id: I41bb05cea231397d145c740a45bd24918c0ad73b