Added Task Model
Fixing Conflicts