Commit some excellent progress on the structure and style.