Pack refactor

Closes #2054 
Closes #2055 
Closes #2056