Redo Pack writing/Packing

This code is just a mess and not particularly great.