Updated parser, now gets us through parsing attachments and attachment headers