reorganized AllMessages to be less of a pain in the future