Process task development
Some updates to the architecture based on our meeting today.
Merge remote-tracking branch 'origin/newgen' into newgen
Small adjustments after today's meeting.