JS stuff per issue #29