added some stub functions to demonstrate intent of refactor, began refactoring