redid everything in javascript.js