WIP on JS expression support