Also refactored message innards :)