Finished first pass of messaging basics