Redid entire JS
Merge branch 'retry' into gh-pages
Changed a few things