mostly made it so you can pack.
Merge remote-tracking branch 'origin/master'