massive change, break-out graphing in separate script