Progress working through Mack's comments