First pass of re-adding jscript support