I've played around with this and think I'm gonna merge without making a change here. We can revisit later.