Beginning to add message parsing