Progress on tasks
Merge branch 'german-assignments' into candidate4

Branch merged with German tasks