@tacaswell Took care of the this with the last round of commits