starting to make changes to these scripts to clean them up