Better message management. Still needs work.