CSP implementation todo