Message handling nearly complete