First pass at integrating the messages and flow into duo mode