Knocked off another TODO