first pass on save / restore chat
first pass adding persistent chat
merged
resolved merge conflicts