Add option to turn on and off the diagnostic system, and added a TODO.