Class Notes and chat client updates
attempted merge