Finished part 2 and bonus 1