Progress with vanilla shim implementation
Reducing the number of times that elements are wrapped
Progress