Feature/412 address verification

Phase 1 of #412.