use commonjs-everywhere now
half done refactor