Add tasks

Merge the tasks model into master_test