Verify intent

A WIP on verifying intent. Pushed as a PR since it's most probably will be commits squashed etc.