Chat Finished

Chat finished on the main client, but the file containing all the shit
for Sprint 2 is much closer to finished. Anyone mind merging the two?