Added more to TODO, deleted "pull and store tasks"