Should I do this within this PR? I was going to make a separate one.