Major refactoring of CMessage...one error left