merging branches
Revised client comm module