messaging conversion finished, needs a lot of post refactor cleanup