Changes in prep for chat functionality