Chat client interim commit. Lots of code reorg.