IT WORKS! Tidy up output and format/comment properly