Added TODO-tasks