more JS WIP