Refactor is so hard. I have this design that I thought was cute and now it's biting me.