Refactoring to make it testable
Testing!