Added formatting of output, still very much in progress