Initial diagnostic commit