Are we going to put this messages stuff in a base template somewhere? Doesn't have to be in this PR -- just checking that it'll happen somewhere.