First pass at refactor
Merge remote-tracking branch 'origin/feature/extend-support' into feature/printable-refactor
Updates to isPrintable based on test failures.