Trying again

- Oh and making Client output nicer!