Make Contact base class more useful.
Work on the message format.
Cleanup.