Finish up most of the Message apis