I don't think I will do this for this PR, but I do have 2 more features to add to the view where I may do this.