First stab at unpack/repack
First stab at unpack/repack