Done part 1 & 2
test