Bring TODO up to date