Now to expand this to package storage/loading