I almost completed message logic.
Merge branch 'rfrost'