Added tasks for the next proto

Trying to merge Leon's and Claus' Branches