Add some comments, and a stub for future message generation