messaging setup
merge with master, resolve conflicts