Mid progress commit, some formatting, and fiddling. No judging.