Done with messages
This should:
Closes #39