Raaaah, refactoring to an infinite loop. TESTING 1 - Me 0.
Much improved wrapping. Not yet perfect, but better.