Removed some already done todo's and chose mine.