big move and edits for the package experiment