Work in progress: embedded messages done
Cope with optional embedded messages
Cope with repeated messages