Initial commit of plot wrapping updates.