** Temp commit. Full reformat of source to see what changes it made.