Chat

Seems stable enough to PR into develop.