Initial Task model
Merge branch 'task-model' into development