break apart wrapper into more atomic pieces
added unwrap button to wrap-options