Expanded message struct.  Implemented json persistence.