Refactoring to account for passed in function names.