Feature/secondary arch compose

Lots of updates to the compose messages.