Fixed build of problem 1 of DZ1, finished DZ2