#98 - Updates based off Keith's comments