Continued to work on chat logic