More todo updates! Another future issue!