[WIP] Add some initial validation logic.

Missing a push? Seems the same...