add some conversations functionality
merge barons code and update conversations feature