#7 Messaging feature: stage 2 commit