Finished first pass of multimessage refactor. About to merge into main code.