Refactor printing
Beginnings of a builder