Small refactor.
Branch to test Table Output
Steve adding print out and other functionality as a trial.
Minor refactoring.