Perliminary restructuring / implementation of the diagnostics system.