Finished reviewing CSP implementation for now will have to go over again during review