@jrbasso what was your idea with this TODO?