Struggled to separate the pieces here as the line is sooooo long.  The others are out of scope for this PR, but could you reduce the ones you have added for this PR?