@oxtoacart Mind if we just knock out this TODO before we merge?