Merged opts.js and envoy.js for the time being