Diagnostic CPT safety commit

not sure where I am and need to review the code to get back on track.