MERGE SECOND: Switch session.coffee to session.js