More messages. Closes #1