moved js back to scripts
merging