c/s comm updates (unfinished)