Tag chat message with ID
Tweak ID generation
Add TODO item