Messing with validation of messages. I have a bit more to do, but this is the first step