More stuff on message parsing. Thinking in changing the structure.