Lab2 challenge 1&2 finished