should this TODO be left in the commit?