WIP initial chat integrations
fix which user to display on message processing
merge master