More sophisticated wrapping strategy for usage
Test wrapping strategy.
Closes #89. Closes #125