Initial stab at chat changes

Not sure if this is quite right yet, but checking in now