Verification overhaul

Fixes #79