Terry makes a wrap. Looks just like the skirt part of the skort. Kinda pricey, though.

I have the commuter in a surf-board print, and love it. Really love the pocket on the thigh of the shorts part!