First cut at 2D wrapping
Wrapping now working.