Refactored data mgmt/collection out to new scripts