diff --git a/server.js b/server.js
index 5157bab..4c9dd23 100644
--- a/server.js
+++ b/server.js
@@ -6,7 +6,6 @@ app.use(bodyParser.urlencoded({ extended: true }));   // Also need url encoding
 var winston = require('winston');
 winston.add(winston.transports.File, { filename: './logs/notes.kaplon.us.log', maxsize: 5000000 });  // 5MB
 var fileSystem = require('fs');
-var notePath = __dirname + '/note-data/allNotes.txt';
 var favicon = require('serve-favicon');
 app.use(favicon(__dirname + '/assets/favicon.ico'));  // Put this before setting static dir.
 app.use(express.static(__dirname + '/assets'));
@@ -109,11 +108,19 @@ io.on('connection', function(socket){
         socket.emit('redirect', '/login');
         socket.disconnect();
     }
-    // next line works until container restarted...need to validate session existence?
-    // or is the problem with a nodemon restart???
-    winston.info('user id, '+ socket.handshake.session.passport.user);
-    // not sure if next line works yet...
+    // next line no worky...but might get by with only user-#.
     //winston.info('user name, '+ socket.handshake.session.passport.user.username);
+    var userNum = socket.handshake.session.passport.user;
+    winston.info('user id, '+ userNum);
+    socket.join(userNum);
+    var notePath, noteDir
+    if (userNum === 1) {
+        notePath = __dirname + '/note-data/allNotes.txt';
+        noteDir = __dirname + '/note-data/';
+    } else {
+        notePath = __dirname + '/note-data/' + userNum + '/allNotes.txt';
+        noteDir = __dirname + '/note-data/' + userNum + '/';
+    }
     fileSystem.readFile(notePath, {encoding: 'utf-8'}, function(err,data){
         if (!err){
             winston.info('file read on connection');
@@ -132,7 +139,7 @@ io.on('connection', function(socket){
                     if (err) { winston.error(err); }
                     var exec = require('child_process').exec;
                     var cmd = `
-                        cd note-data && \
+                        cd ${noteDir} && \
                         git checkout -b ${now} && \
                         git commit -am "Notes modified via websocket, ${now}" && \
                         git checkout master && \
@@ -142,19 +149,19 @@ io.on('connection', function(socket){
                     exec(cmd, function(error, stdout, stderr) {
                         if (error) { winston.error(error); }
                         if (!stdout.includes('CONFLICT')) {   // Case-sensitivity seems brittle here. Better to check return code rather than stdout? Can child_process be called w/signature to include return code?
-                            var cmd2 = `cd note-data && git branch -d ${now}`
+                            var cmd2 = `cd ${noteDir} && git branch -d ${now}`
                             exec(cmd2, function(error, stdout, stderr) {
                                 if (error) { winston.error(error); }
                                 winston.info('temp branch deleted; new content written to allNotes.txt');
                                 // Send new content to all other clients EXCEPT the orig sender.
-                                socket.broadcast.emit('download allNotes',msg);
+                                socket.in(userNum).emit('download allNotes',msg);
                                 winston.info('sent content update to other clients');
                             });
                         } else {
                             // Auto-merge failed, keep the new branch.
                             // Send a conflict warning message to socket.io clients (prompt for IAP ;-).
-                            socket.emit('conflict', `Auto-merge failed, manually merge ${now} branch to rescue recent edit.`);
-                            socket.emit('download allNotes',data);  // Send pre-conflict content back down to client.
+                            socket.in(userNum).emit('conflict', `Auto-merge failed, manually merge ${now} branch to rescue recent edit.`);
+                            socket.in(userNum).emit('download allNotes',data);  // Send pre-conflict content back down to client.
                             winston.info(`Auto-merge failed, manually merge ${now} branch to rescue recent edit.`);
                             // MVP for now, can deal w/merge conflicts with git on the server if the cotent needs to be saved.
                         }