MERGE SECOND: Switch Session.coffee to Session.js