Reorganizing scripts to help with timing issues.