Re-added Grams + Lots of packing fixes