Create TODO list, remove FIXME comment full of to do items.