Refactored out some of the methods that used my extensions where not needed, and implemented the Pack method fully