organized some and added chat feature