Adding: breaking out message handling