Bja/feature/task creation