Finished adding who and chat features