Restructure messages.
Moar tests!