organize, document, and add message queries