Updated TODO-list