fixup! Adds initial messaging functionality