Added unwrapAll and rewrote unwrap in terms of it