Task 10

Work on task 10, tidied up formatter.