Started adding enable/disable toggles to debug-trace