modal form created
chat set up in progress
Merge branch 'feature/chat'
merge conflicts resolved