Break up functions to prepare for testing
Merge pull request #8 from alexKleider/refactor/break_up_for_testing

Break up functions to prepare for testing