Partial move away from printing to logging per #27