Problem 4 done
Tidy up problem 2