[WIP] Add some initial validation logic.

done.