Pack

The patch needs some tweaking. I decided to create the PR so that someone else can help too.