WIP

New version of the javascript