Nicer formatting and 5 and 6
Working on number 7