Yes, the article at the top is what we did and it is long-time storage. Stuff just cannot have oil in it.
Thx!