started implementing chat feature: Rudimentary state
fixed merge conflicts