Tidied up.
Nearly done.