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

german changes