Updated most all text to print using new class based printing