Work on updating JS
Work on JS refactor