Pushed trollr.js to main