updated TODO based on today's merge