Some development! Need to start CSP work