reorganizing and scripts progress