Total refactor of the print code.
Preparing for 1.6.1