Task feature

Merge first iteration of the task feature into develop.