1.2 finished, working, fixed, bonusaufgabe finished