Trying to see if moving back to separate JS files will fix things