Preserve packaging

Ideas collected by Jesse Dodds