I think my original logic split things up even more, but yeah, now it's fine to merge.