Refactoring, adding wrap method
All tests are green, about to start Chapter 11