Make basic chats work again.

Add todos.