Stable Client Composite

Client Composite now stable and connecting fine. Merging to master.