Rewrote entire wrapper.