Yes, should I pull it out into a separate PR?