Feature/tasx 16 subtasks