Abstract out message handling and verification better