From cf8654fd353a60ef333e3a0b6eb96498c3a1aebd Mon Sep 17 00:00:00 2001
From: Kinan Dak Al Bab <kinan.bab.14@gmail.com>
Date: Sat, 5 Jan 2019 20:54:17 -0500
Subject: [PATCH 1/9] Begin work on join/filter/count demo

UI and client.js done. MPC implementation and test TODO
---
 demos/table-join-filter-count/TODO        |  31 +++++
 demos/table-join-filter-count/client.html |  45 +++++++
 demos/table-join-filter-count/client.js   | 152 ++++++++++++++++++++++
 demos/table-join-filter-count/mpc.js      |  38 ++++++
 demos/table-join-filter-count/party.js    |  43 ++++++
 demos/table-join-filter-count/server.js   |  20 +++
 demos/table-join-filter-count/test.js     | 131 +++++++++++++++++++
 7 files changed, 460 insertions(+)
 create mode 100644 demos/table-join-filter-count/TODO
 create mode 100644 demos/table-join-filter-count/client.html
 create mode 100644 demos/table-join-filter-count/client.js
 create mode 100644 demos/table-join-filter-count/mpc.js
 create mode 100644 demos/table-join-filter-count/party.js
 create mode 100644 demos/table-join-filter-count/server.js
 create mode 100644 demos/table-join-filter-count/test.js
diff --git a/demos/table-join-filter-count/TODO b/demos/table-join-filter-count/TODO
new file mode 100644
index 000000000..5e90b3cd5
--- /dev/null
+++ b/demos/table-join-filter-count/TODO
@@ -0,0 +1,31 @@
+1. Implement MPC algorithm:
+  * Data = [];
+  * // JOIN
+  * Loop over (SSN, Gender) in party 1 input:
+    + secret(flag), secret(INCOME) = modified binary search for SSN in party 2 input
+    + if i != -1
+      - Data.add(Gender, Income)
+    + else
+      - Data.add(2, -1) // 2 in gender means invalid entry
+  * // JOIN COMPLETE --- n log n comparison, n^2 multiplications
+  * // FILTER
+  * Loop over (Gender, Income) in Data:
+    + if Income > SOME CONSTANT
+      - Data unchanged
+    + else
+      - Replace with (2, 0)
+  * // FILTER COMPLETE --- n comparison, n multiplication
+  * // COUNT
+  * Result = [ { gender: 'M', count: share(0) }, { gender: 'F', count: share(0) } ]
+  * Loop over (Gender, Income) in Data:
+    + cmp1 = Gender == 0
+    + cmp2 = Gender == 1
+    + Result[0].count += cmp1
+    + Result[1].count += cmp2
+  * // COUNT COMPLETE --- 2n equality checks, 2n multiplications
+
+
+
+2. party.js: parse input as CSV.
+
+3. test.js: parallel = 1, run for small random tables.
diff --git a/demos/table-join-filter-count/client.html b/demos/table-join-filter-count/client.html
new file mode 100644
index 000000000..a4277bddf
--- /dev/null
+++ b/demos/table-join-filter-count/client.html
@@ -0,0 +1,45 @@
+<!-- Basic UI for running the demo in the browser -->
+
+<html>
+  <head>
+    <title>Sum integers under MPC</title>
+    <style>
+      .error {
+        color: #FF0000;
+      }
+    </style>
+    <script src="https://code.jquery.com/jquery-1.11.1.js"></script>
+    <script src="/socket.io/socket.io.js"></script>
+    <script src="/lib/sodium.js"></script>
+    <script src="/lib/jiff-client.js"></script>
+
+    <!-- Contains UI Handlers and Input Checks -->
+    <script type="text/javascript" src="./client.js"></script>
+
+    <!-- Contains the MPC implementation -->
+    <script type="text/javascript" src="./mpc.js"></script>
+  </head>
+  <body>
+    <h1>Connect JIFF</h1>
+    <label for="computation_id">Computation ID</label><input id="computation_id" value="test"></input><br/><br/>
+    <label for="count">Party Count<label> <input id="count" pattern="[0-9]*" value="2" disabled="disabled"><br/><br/>
+    <label for="role">Party Role<label>
+    <select id="role">
+      <option value="1">Provide Gender</option>
+      <option value="2">Provide Income</option>
+    </select>
+    &nbsp; <button id="connectButton" onclick="connect();">Connect</button>
+    <br/><br/>
+    <hr/>
+    <h1>Join / Filter / Group By under MPC</h1>
+    <label for="size">Enter your table's size</label> <input id="size" pattern="[0-9]+">
+    &nbsp; <button id="submit" onclick="generateTable(document.getElementById('size').value)" disabled="disabled">Input</button>
+    
+    <br>
+    <div id="input_area">
+    
+    </div>    
+    <button onclick="submit();" disabled="disabled" id="button">Submit</button><br/>
+    <div id="output"></div>
+  </body>
+</html>
diff --git a/demos/table-join-filter-count/client.js b/demos/table-join-filter-count/client.js
new file mode 100644
index 000000000..274f2f850
--- /dev/null
+++ b/demos/table-join-filter-count/client.js
@@ -0,0 +1,152 @@
+/**
+ * Do not modify this file unless you have to.
+ * This file has UI handlers.
+ */
+
+// eslint-disable-next-line no-unused-vars
+function connect() {
+  $('#connectButton').prop('disabled', true);
+  var computation_id = $('#computation_id').val();
+  var party_count = parseInt($('#count').val());
+  var party_id = parseInt($('#role').val());
+
+  if (isNaN(party_count)) {
+    $('#output').append('<p class=\'error\'>Party count must be a valid number!</p>');
+    $('#connectButton').prop('disabled', false);
+  } else {
+    var options = { party_count: party_count, party_id: party_id };
+    options.onError = function (error) {
+      $('#output').append('<p class=\'error\'>'+error+'</p>');
+    };
+    options.onConnect = function () {
+      $('#button').attr('disabled', false);
+      $('#submit').attr('disabled', false);
+      $('#output').append('<p>All parties Connected!</p>');
+    };
+
+    var hostname = window.location.hostname.trim();
+    var port = window.location.port;
+    if (port == null || port === '') {
+      port = '80';
+    }
+    if (!(hostname.startsWith('http://') || hostname.startsWith('https://'))) {
+      hostname = 'http://' + hostname;
+    }
+    if (hostname.endsWith('/')) {
+      hostname = hostname.substring(0, hostname.length-1);
+    }
+    if (hostname.indexOf(':') > -1 && hostname.lastIndexOf(':') > hostname.indexOf(':')) {
+      hostname = hostname.substring(0, hostname.lastIndexOf(':'));
+    }
+
+    hostname = hostname + ':' + port;
+    // eslint-disable-next-line no-undef
+    mpc.connect(hostname, computation_id, options);
+  }
+}
+
+// eslint-disable-next-line no-unused-vars
+function submit() {
+  var party_id = parseInt($('#role').val());
+
+  var data = [];
+  var table = document.getElementById('input_table');
+  for (var i = 1; i < table.rows.length; i++) {
+    var row = table.rows[i];
+    var SSN = row.cells[0].getElementsByTagName('input')[0].value;
+    var value = row.cells[1].getElementsByTagName('input')[0].value;
+
+    SSN = parseInt(SSN.split('-').join(''));
+    if (isNaN(SSN)) {
+      $('#output').append('<p class=\'error\'>Make sure all SSNs are valid!</p>');
+      return;
+    }
+
+    if (party_id === 1) {
+      if (value !== 'M' && value !== 'F') {
+        $('#output').append('<p class=\'error\'>Gender must be M or F!</p>');
+        return;
+      }
+
+      value = value === 'F' ? 1 : 0;
+    }
+    
+    data.push({ SSN: SSN, value: value });
+  }
+
+  // Sort by SSN
+  data.sort(function (x, y) {
+    return x.SSN - y.SSN;
+  });
+
+  // Split Array
+  var SSNs = [];
+  var vals = [];
+  for (var d = 0; d < data.length; d++) {
+    SSNs.push(data[d].SSN);
+    vals.push(data[d].value);
+  }
+
+  _submit(SSNS, vals);
+}
+
+function _submit(SSNs, vals) {
+  $('#button').attr('disabled', true);
+  $('#submit').attr('disabled', true);
+  $('#output').append('<p>Starting...</p>');
+  // eslint-disable-next-line no-undef
+  var promise = mpc.compute(SSNs, vals);
+  promise.then(handleResult);
+}
+
+function handleResult(result) {
+  var HEADERS = [ 'GENDER', 'NUMBER OF PEOPLE WITH INCOME > 1000' ];
+
+  var table = '<table>';
+  // Header
+  table += '<tr>';
+  for (var i = 0; i < HEADERS.length; i++) {
+    table += '<th>'+HEADERS[i]+'</th>';
+  }
+  table += '</tr>';
+
+  // Generate Body
+  for (var j = 0; j < result.length; j++) {
+    table += '<tr>';  
+    table += '<td>' + result[j].gender + '</td>';
+    table += '<td>' + result[j].count + '</td>';
+    table += '</tr>';
+  }
+
+  table += '</table>';
+  $('#output').html(table);
+  $('#submit').attr('disabled', false);
+  $('#button').attr('disabled', false);
+}
+
+function generateTable(size) {
+  var HEADERS = [ 'SSN' ];
+  var party_id = parseInt($('#role').val());
+  HEADERS[1] = party_id === 1 ? 'GENDER' : 'INCOME';
+
+  var table = '<br/><table id="input_table">';
+  // Header
+  table += '<tr>';
+  for (var i = 0; i < HEADERS.length; i++) {
+    table += '<th>'+HEADERS[i]+'</th>';
+  }
+  table += '</tr>';
+
+  // Generate Body
+  for (var j = 0; j < size; j++) {
+    table += '<tr>';  
+    for (var k = 0; k < HEADERS.length; k++) {
+      var input = '<input type="text">';
+      table += '<td>' + input + '</td>';
+    }
+    table += '</tr>';
+  }
+
+  table += '</table>';
+  $('#input_area').html(table);
+}
diff --git a/demos/table-join-filter-count/mpc.js b/demos/table-join-filter-count/mpc.js
new file mode 100644
index 000000000..f2dac7d08
--- /dev/null
+++ b/demos/table-join-filter-count/mpc.js
@@ -0,0 +1,38 @@
+(function (exports, node) {
+  var saved_instance;
+
+  /**
+   * Connect to the server and initialize the jiff instance
+   */
+  exports.connect = function (hostname, computation_id, options) {
+    var opt = Object.assign({}, options);
+
+    if (node) {
+      // eslint-disable-next-line no-undef
+      jiff = require('../../lib/jiff-client');
+    }
+
+    // eslint-disable-next-line no-undef
+    saved_instance = jiff.make_jiff(hostname, computation_id, opt);
+    return saved_instance;
+  };
+
+  /**
+   * The MPC computation
+   */
+  exports.compute = function (input, jiff_instance) {
+    if (jiff_instance == null) {
+      jiff_instance = saved_instance;
+    }
+
+    // The MPC implementation should go *HERE*
+    var shares = jiff_instance.share(input);
+    var sum = shares[1];
+    for (var i = 2; i <= jiff_instance.party_count; i++) {
+      sum = sum.sadd(shares[i]);
+    }
+
+    // Return a promise to the final output(s)
+    return jiff_instance.open(sum);
+  };
+}((typeof exports === 'undefined' ? this.mpc = {} : exports), typeof exports !== 'undefined'));
diff --git a/demos/table-join-filter-count/party.js b/demos/table-join-filter-count/party.js
new file mode 100644
index 000000000..a1d8f7189
--- /dev/null
+++ b/demos/table-join-filter-count/party.js
@@ -0,0 +1,43 @@
+/**
+ * Do not change this unless you have to.
+ * This code parses input command line arguments,
+ * and calls the appropriate initialization and MPC protocol from ./mpc.js
+ */
+
+console.log('Command line arguments: <input> [<party count> [<computation_id> [<party id>]]]]');
+
+var mpc = require('./mpc');
+
+// Read Command line arguments
+var input = parseInt(process.argv[2], 10);
+
+var party_count = process.argv[3];
+if (party_count == null) {
+  party_count = 2;
+} else {
+  party_count = parseInt(party_count);
+}
+
+var computation_id = process.argv[4];
+if (computation_id == null) {
+  computation_id = 'test';
+}
+
+var party_id = process.argv[5];
+if (party_id != null) {
+  party_id = parseInt(party_id, 10);
+}
+
+// JIFF options
+var options = {party_count: party_count, party_id: party_id};
+options.onConnect = function (jiff_instance) {
+  var promise = mpc.compute(input);
+
+  promise.then(function (v) {
+    console.log(v);
+    jiff_instance.disconnect(true);
+  });
+};
+
+// Connect
+mpc.connect('http://localhost:8080', computation_id, options);
diff --git a/demos/table-join-filter-count/server.js b/demos/table-join-filter-count/server.js
new file mode 100644
index 000000000..440ce621c
--- /dev/null
+++ b/demos/table-join-filter-count/server.js
@@ -0,0 +1,20 @@
+var express = require('express');
+var app = express();
+var http = require('http').Server(app);
+
+//Serve static files
+//Configure App
+app.use('/demos', express.static('demos'));
+app.use('/lib', express.static('lib'));
+app.use('/lib/ext', express.static('lib/ext'));
+
+require('../../lib/jiff-server').make_jiff(http, { logs:true });
+
+// Serve static files.
+http.listen(8080, function () {
+  console.log('listening on *:8080');
+});
+
+console.log('Direct your browser to *:8080/demos/table-join-filter-count/client.html.');
+console.log('To run a node.js based party: node demos/table-join-filter-count/party <input>');
+console.log();
diff --git a/demos/table-join-filter-count/test.js b/demos/table-join-filter-count/test.js
new file mode 100644
index 000000000..5fef4b897
--- /dev/null
+++ b/demos/table-join-filter-count/test.js
@@ -0,0 +1,131 @@
+// Chai
+var assert = require('chai').assert;
+
+var mpc = require('./mpc.js');
+
+// Generic Testing Parameters
+var showProgress = false;
+var party_count = 3;
+var parallelismDegree = 100; // Max number of test cases running in parallel
+var n = 1000;
+var Zp = null;
+
+// Parameters specific to this demo
+var maxValue = 1000;
+
+
+/**
+ * CHANGE THIS: Generate inputs for your tests
+ * Should return an object with this format:
+ * {
+ *   'party_id': [ 'test1_input', 'test2_input', ...]
+ * }
+ */
+function generateInputs(party_count) {
+  var inputs = {};
+  var i;
+
+  for (i = 0; i < party_count; i++) {
+    inputs[i+1] = [];
+  }
+
+  for (i = 0; i < party_count; i++) {
+    for (var j = 0; j < n; j++) {
+      inputs[i+1].push(Math.floor((Math.random() * maxValue)));
+    }
+  }
+  return inputs;
+}
+
+/**
+ * CHANGE THIS: Compute the expected results not in MPC
+ * @param {object} inputs - same format as generateInputs output.
+ * Should return a single array with the expected result for every test in order
+ *   [ 'test1_output', 'test2_output', ... ]
+ */
+function computeResults(inputs) {
+  var results = [];
+
+  for (var j = 0; j < n; j++) {
+    var sum = 0;
+    for (var i = 1; i <= party_count; i++) {
+      sum += inputs[i][j];
+    }
+    results.push(sum);
+  }
+  return results;
+}
+
+/**
+ * Do not change unless you have to.
+ */
+// eslint-disable-next-line no-undef
+describe('Test', function () {
+  this.timeout(0); // Remove timeout
+
+  // eslint-disable-next-line no-undef
+  it('Exhaustive', function (done) {
+    var count = 0;
+
+    var inputs = generateInputs(party_count);
+    var realResults = computeResults(inputs);
+
+    var onConnect = function (jiff_instance) {
+      var partyInputs = inputs[jiff_instance.id];
+
+      var testResults = [];
+      (function one_test_case(j) {
+        if (jiff_instance.id === 1 && showProgress) {
+          console.log('\tStart ', j > partyInputs.length ? partyInputs.length : j, '/', partyInputs.length);
+        }
+
+        if (j < partyInputs.length) {
+          var promises = [];
+          for (var t = 0; t < parallelismDegree && (j + t) < partyInputs.length; t++) {
+            promises.push(mpc.compute(partyInputs[j + t], jiff_instance));
+          }
+
+          Promise.all(promises).then(function (parallelResults) {
+            for (var t = 0; t < parallelResults.length; t++) {
+              testResults.push(parallelResults[t]);
+            }
+
+            one_test_case(j + parallelismDegree);
+          });
+
+          return;
+        }
+
+        // If we reached here, it means we are done
+        count++;
+        for (var i = 0; i < testResults.length; i++) {
+          // construct debugging message
+          var ithInputs = inputs[1][i] + '';
+          for (var p = 2; p <= party_count; p++) {
+            ithInputs += ',' + inputs[p][i];
+          }
+          var msg = 'Party: ' + jiff_instance.id + '. inputs: [' + ithInputs + ']';
+
+          // assert results are accurate
+          try {
+            assert.deepEqual(testResults[i].toString(), realResults[i].toString(), msg);
+          } catch (assertionError) {
+            done(assertionError);
+            done = function () {
+            };
+          }
+        }
+
+        jiff_instance.disconnect(true);
+        if (count === party_count) {
+          done();
+        }
+      })(0);
+    };
+
+    var options = { party_count: party_count, onError: console.log, onConnect: onConnect, Zp: Zp };
+    for (var i = 0; i < party_count; i++) {
+      mpc.connect('http://localhost:8080', 'mocha-test', options);
+    }
+  });
+});
\ No newline at end of file

From b1811aa03655edad0412beed981b0f338aabcf35 Mon Sep 17 00:00:00 2001
From: Kinan Dak Al Bab <kinan.bab.14@gmail.com>
Date: Sat, 5 Jan 2019 20:55:09 -0500
Subject: [PATCH 2/9] Ignore new demo for now

---
 demos/run-test.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/demos/run-test.sh b/demos/run-test.sh
index 3081321f6..a9dae7b6e 100755
--- a/demos/run-test.sh
+++ b/demos/run-test.sh
@@ -6,7 +6,7 @@ if [ "$1" == "*" ]; then
     EXIT_CODE=0
     for i in demos/*; do
         if [ -f "$i/test.js" ]; then
-            if ! [[ "$i" =~ ^demos/(pca|restAPI|routing|mpc-web|template)$ ]]; then
+            if ! [[ "$i" =~ ^demos/(pca|restAPI|routing|mpc-web|template|table-join-filter-count)$ ]]; then
                 sleep 2
                 npm run-script test-demo -- "$i"
                 CODE=$?
@@ -36,4 +36,4 @@ else
 
     kill $(ps aux | grep " ${TESTDIR}/server\.js" | awk '{ print $2}')
     exit "$EXIT_CODE"
-fi
\ No newline at end of file
+fi

From 6f619fcc0230962e74256de85bf9aa4326cea1c9 Mon Sep 17 00:00:00 2001
From: Kinan Dak Al Bab <kinan.bab.14@gmail.com>
Date: Sun, 3 Feb 2019 17:57:47 -0500
Subject: [PATCH 3/9] Implement join via binary search

---
 demos/table-join-filter-count/TODO      |  4 ++
 demos/table-join-filter-count/client.js | 21 ++-----
 demos/table-join-filter-count/mpc.js    | 77 ++++++++++++++++++++++---
 3 files changed, 78 insertions(+), 24 deletions(-)

diff --git a/demos/table-join-filter-count/TODO b/demos/table-join-filter-count/TODO
index 5e90b3cd5..4d8a61186 100644
--- a/demos/table-join-filter-count/TODO
+++ b/demos/table-join-filter-count/TODO
@@ -8,6 +8,10 @@
     + else
       - Data.add(2, -1) // 2 in gender means invalid entry
   * // JOIN COMPLETE --- n log n comparison, n^2 multiplications
+
+
+  /// GOT HERE
+
   * // FILTER
   * Loop over (Gender, Income) in Data:
     + if Income > SOME CONSTANT
diff --git a/demos/table-join-filter-count/client.js b/demos/table-join-filter-count/client.js
index 274f2f850..e421de510 100644
--- a/demos/table-join-filter-count/client.js
+++ b/demos/table-join-filter-count/client.js
@@ -70,24 +70,11 @@ function submit() {
 
       value = value === 'F' ? 1 : 0;
     }
-    
-    data.push({ SSN: SSN, value: value });
-  }
 
-  // Sort by SSN
-  data.sort(function (x, y) {
-    return x.SSN - y.SSN;
-  });
-
-  // Split Array
-  var SSNs = [];
-  var vals = [];
-  for (var d = 0; d < data.length; d++) {
-    SSNs.push(data[d].SSN);
-    vals.push(data[d].value);
+    data.push({ SSN: SSN, value: value });
   }
 
-  _submit(SSNS, vals);
+  _submit(data);
 }
 
 function _submit(SSNs, vals) {
@@ -112,7 +99,7 @@ function handleResult(result) {
 
   // Generate Body
   for (var j = 0; j < result.length; j++) {
-    table += '<tr>';  
+    table += '<tr>';
     table += '<td>' + result[j].gender + '</td>';
     table += '<td>' + result[j].count + '</td>';
     table += '</tr>';
@@ -139,7 +126,7 @@ function generateTable(size) {
 
   // Generate Body
   for (var j = 0; j < size; j++) {
-    table += '<tr>';  
+    table += '<tr>';
     for (var k = 0; k < HEADERS.length; k++) {
       var input = '<input type="text">';
       table += '<td>' + input + '</td>';
diff --git a/demos/table-join-filter-count/mpc.js b/demos/table-join-filter-count/mpc.js
index f2dac7d08..0a7cd7bc2 100644
--- a/demos/table-join-filter-count/mpc.js
+++ b/demos/table-join-filter-count/mpc.js
@@ -17,22 +17,85 @@
     return saved_instance;
   };
 
+  var binary_search = function (jiff_instance, element, keys, values) {
+    if (keys.length === 0) {
+      var found = keys[0].seq(element);
+      var val = found.if_else(values[0], jiff_instance.Zp - 1);
+      return { found: found, val: val };
+    }
+
+    // comparison
+    var mid = Math.floor(keys.length/ 2);
+    var cmp = element.slt(keys[mid]);
+
+    // Slice array in half, choose slice depending on cmp
+    var nKeys = [], nVals = values;
+    for (var i = 0; i < mid; i++) {
+      nKeys[i] = cmp.if_else(keys[i], keys[mid+i]);
+      nVals[i] = cmp.if_else(values[i], values[mid+i]);
+    }
+
+    // watch out for off by 1 errors if length is odd.
+    if (2*mid < keys.length) {
+      nKeys[mid] = keys[2*mid];
+      nVals[mid] = values[2*mid]
+    }
+
+    return binary_search(jiff_instance, element, nKeys, nVals);
+  };
+
+  var join = function (jiff_instance, SSNs1, vals1, SSNs2, vals2, ind1, ind2) {
+    var data = [];
+    for (var i = 0; i < SSNs1.length; i++) {
+      var res = binary_search(SSNs1[i], SSNs2, vals2);
+
+      var obj = {};
+      obj[ind1] = res.found.if_else(vals1[i], jiff_instance.Zp - 1);
+      obj[ind2] = res.val;
+      data.push(obj);
+    }
+
+    return data;
+  };
+
   /**
    * The MPC computation
    */
-  exports.compute = function (input, jiff_instance) {
+  exports.compute = function (data, jiff_instance) {
     if (jiff_instance == null) {
       jiff_instance = saved_instance;
     }
 
-    // The MPC implementation should go *HERE*
-    var shares = jiff_instance.share(input);
-    var sum = shares[1];
-    for (var i = 2; i <= jiff_instance.party_count; i++) {
-      sum = sum.sadd(shares[i]);
+    // Sort by SSN
+    data.sort(function (x, y) {
+      return x.SSN - y.SSN;
+    });
+
+    // Split Array
+    var SSNs = [];
+    var vals = [];
+    for (var d = 0; d < data.length; d++) {
+      SSNs.push(data[d].SSN);
+      vals.push(data[d].value);
     }
 
+    var promise1 = jiff_instance.share_array(SSNs);
+    var promise2 = jiff_instance.share_array(vals);
+    Promise.all([promise1, promise2]).then(function (shares) {
+      var SSNs1 = shares[0][1];
+      var SSNs2 = shares[0][2];
+      var vals1 = shares[0][1];
+      var vals2 = shares[0][2];
+
+      var data = [];
+      if (SSNs1.length < SSNs2.length) {
+        data = join(jiff_instance, SSNs1, vals1, SSNs2, vals2, 1, 2);
+      } else {
+        data = join(jiff_instance, SSNs2, vals2, SSNs1, vals1, 2, 1);
+      }
+    });
+
     // Return a promise to the final output(s)
-    return jiff_instance.open(sum);
+    return jiff_instance.open();
   };
 }((typeof exports === 'undefined' ? this.mpc = {} : exports), typeof exports !== 'undefined'));

From c34b2ed650cfd708e45f44ecdd5a1eca4be8e677 Mon Sep 17 00:00:00 2001
From: Kinan Dak Al Bab <kinan.bab.14@gmail.com>
Date: Sun, 10 Feb 2019 17:12:47 -0500
Subject: [PATCH 4/9] Reorganize

---
 demos/run-test.sh                                           | 2 +-
 {demos => presentation}/table-join-filter-count/TODO        | 0
 {demos => presentation}/table-join-filter-count/client.html | 0
 {demos => presentation}/table-join-filter-count/client.js   | 0
 {demos => presentation}/table-join-filter-count/mpc.js      | 0
 {demos => presentation}/table-join-filter-count/party.js    | 0
 {demos => presentation}/table-join-filter-count/server.js   | 0
 {demos => presentation}/table-join-filter-count/test.js     | 0
 8 files changed, 1 insertion(+), 1 deletion(-)
 rename {demos => presentation}/table-join-filter-count/TODO (100%)
 rename {demos => presentation}/table-join-filter-count/client.html (100%)
 rename {demos => presentation}/table-join-filter-count/client.js (100%)
 rename {demos => presentation}/table-join-filter-count/mpc.js (100%)
 rename {demos => presentation}/table-join-filter-count/party.js (100%)
 rename {demos => presentation}/table-join-filter-count/server.js (100%)
 rename {demos => presentation}/table-join-filter-count/test.js (100%)

diff --git a/demos/run-test.sh b/demos/run-test.sh
index 5323bed9d..2bffdb6df 100755
--- a/demos/run-test.sh
+++ b/demos/run-test.sh
@@ -6,7 +6,7 @@ if [ "$1" == "*" ]; then
     EXIT_CODE=0
     for i in demos/*; do
         if [ -f "$i/test.js" ]; then
-            if ! [[ "$i" =~ ^demos/(pca|restAPI|template|table-join-filter-count|mpc-as-a-service)$ ]]; then
+            if ! [[ "$i" =~ ^demos/(pca|restAPI|template|mpc-as-a-service)$ ]]; then
                 sleep 2
                 npm run-script test-demo -- "$i"
                 CODE=$?
diff --git a/demos/table-join-filter-count/TODO b/presentation/table-join-filter-count/TODO
similarity index 100%
rename from demos/table-join-filter-count/TODO
rename to presentation/table-join-filter-count/TODO
diff --git a/demos/table-join-filter-count/client.html b/presentation/table-join-filter-count/client.html
similarity index 100%
rename from demos/table-join-filter-count/client.html
rename to presentation/table-join-filter-count/client.html
diff --git a/demos/table-join-filter-count/client.js b/presentation/table-join-filter-count/client.js
similarity index 100%
rename from demos/table-join-filter-count/client.js
rename to presentation/table-join-filter-count/client.js
diff --git a/demos/table-join-filter-count/mpc.js b/presentation/table-join-filter-count/mpc.js
similarity index 100%
rename from demos/table-join-filter-count/mpc.js
rename to presentation/table-join-filter-count/mpc.js
diff --git a/demos/table-join-filter-count/party.js b/presentation/table-join-filter-count/party.js
similarity index 100%
rename from demos/table-join-filter-count/party.js
rename to presentation/table-join-filter-count/party.js
diff --git a/demos/table-join-filter-count/server.js b/presentation/table-join-filter-count/server.js
similarity index 100%
rename from demos/table-join-filter-count/server.js
rename to presentation/table-join-filter-count/server.js
diff --git a/demos/table-join-filter-count/test.js b/presentation/table-join-filter-count/test.js
similarity index 100%
rename from demos/table-join-filter-count/test.js
rename to presentation/table-join-filter-count/test.js

From 0c1a3b09ed5d1eeee1bd511a4dc15792045caa0c Mon Sep 17 00:00:00 2001
From: Kinan Dak Al Bab <kinan.bab.14@gmail.com>
Date: Mon, 11 Feb 2019 00:26:01 -0500
Subject: [PATCH 5/9] Implement DEMO with only integer types

---
 .../analyst/analyst.html                      |  47 +++++
 .../analyst/analyst.js                        |  86 +++++++++
 .../table-join-filter-count/analyst/mpc.js    |  59 ++++++
 .../table-join-filter-count/client.html       |  45 -----
 .../table-join-filter-count/client.js         | 139 --------------
 .../table-join-filter-count/compute/join.js   |  51 +++++
 .../table-join-filter-count/compute/mpc.js    | 181 ++++++++++++++++++
 .../table-join-filter-count/compute/party.js  |  17 ++
 .../table-join-filter-count/config.json       |   5 +
 .../table-join-filter-count/input/input.html  |  63 ++++++
 .../table-join-filter-count/input/input.js    | 121 ++++++++++++
 .../table-join-filter-count/input/mpc.js      |  48 +++++
 presentation/table-join-filter-count/mpc.js   | 101 ----------
 presentation/table-join-filter-count/party.js |  43 -----
 .../table-join-filter-count/server.js         |  68 +++++--
 presentation/table-join-filter-count/test.js  | 131 -------------
 16 files changed, 734 insertions(+), 471 deletions(-)
 create mode 100644 presentation/table-join-filter-count/analyst/analyst.html
 create mode 100644 presentation/table-join-filter-count/analyst/analyst.js
 create mode 100644 presentation/table-join-filter-count/analyst/mpc.js
 delete mode 100644 presentation/table-join-filter-count/client.html
 delete mode 100644 presentation/table-join-filter-count/client.js
 create mode 100644 presentation/table-join-filter-count/compute/join.js
 create mode 100644 presentation/table-join-filter-count/compute/mpc.js
 create mode 100644 presentation/table-join-filter-count/compute/party.js
 create mode 100644 presentation/table-join-filter-count/config.json
 create mode 100644 presentation/table-join-filter-count/input/input.html
 create mode 100644 presentation/table-join-filter-count/input/input.js
 create mode 100644 presentation/table-join-filter-count/input/mpc.js
 delete mode 100644 presentation/table-join-filter-count/mpc.js
 delete mode 100644 presentation/table-join-filter-count/party.js
 delete mode 100644 presentation/table-join-filter-count/test.js

diff --git a/presentation/table-join-filter-count/analyst/analyst.html b/presentation/table-join-filter-count/analyst/analyst.html
new file mode 100644
index 000000000..65139bfa4
--- /dev/null
+++ b/presentation/table-join-filter-count/analyst/analyst.html
@@ -0,0 +1,47 @@
+<!-- Basic UI for running the demo in the browser -->
+
+<html>
+  <head>
+    <title>Sum integers under MPC</title>
+    <style>
+      .error {
+        color: #FF0000;
+      }
+
+      td, th {
+        border: solid 1px darkgray;
+      }
+
+      th input, td input {
+        width: 70px;
+      }
+    </style>
+    <script src="https://code.jquery.com/jquery-1.11.1.js"></script>
+    <script src="/socket.io/socket.io.js"></script>
+    <script src="/lib/sodium.js"></script>
+    <script src="/lib/jiff-client.js"></script>
+
+    <!-- Contains UI Handlers and Input Checks -->
+    <script type="text/javascript" src="/static/analyst/analyst.js"></script>
+
+    <!-- Contains the MPC implementation -->
+    <script type="text/javascript" src="/static/analyst/mpc.js"></script>
+  </head>
+  <body>
+    <h1>Analyst</h1>
+    <h3>Input Parties Schemas:</h3>
+    <div id="schema"></div>
+
+    <h3>Analysis:</h3>
+    <textarea rows="8" cols="75" placeholder="Enter your query"></textarea>
+    <br/>
+    <button onclick="submit();" id="submit">Query</button>
+    <br/>
+    <h3>Output:</h3>
+    <div id="output"></div>
+  </body>
+
+  <script type="text/javascript">
+    connect({{config.compute + 1}}, {{config.total}}, {{config.compute}}, '{{ config.computation_id }}');
+  </script>
+</html>
diff --git a/presentation/table-join-filter-count/analyst/analyst.js b/presentation/table-join-filter-count/analyst/analyst.js
new file mode 100644
index 000000000..f82d80c45
--- /dev/null
+++ b/presentation/table-join-filter-count/analyst/analyst.js
@@ -0,0 +1,86 @@
+/**
+ * Do not modify this file unless you have to.
+ * This file has UI handlers.
+ */
+
+// eslint-disable-next-line no-unused-vars
+var computes = [];
+function connect(party_id, party_count, compute_count, computation_id) {
+  // Compute parties ids
+  for (var c = 1; c <= compute_count; c++) {
+    computes.push(c);
+  }
+
+  // jiff options
+  var options = { party_count: party_count, party_id: party_id };
+  options.onError = function (error) {
+    $('#output').append('<p class=\'error\'>'+error+'</p>');
+  };
+  options.onConnect = function () {
+    $('#output').append('<p>Connected!</p>');
+  };
+
+  // host name
+  var hostname = window.location.hostname.trim();
+  var port = window.location.port;
+  if (port == null || port === '') {
+    port = '80';
+  }
+  if (!(hostname.startsWith('http://') || hostname.startsWith('https://'))) {
+    hostname = 'http://' + hostname;
+  }
+  if (hostname.endsWith('/')) {
+    hostname = hostname.substring(0, hostname.length-1);
+  }
+  if (hostname.indexOf(':') > -1 && hostname.lastIndexOf(':') > hostname.indexOf(':')) {
+    hostname = hostname.substring(0, hostname.lastIndexOf(':'));
+  }
+
+  hostname = hostname + ':' + port;
+
+  // eslint-disable-next-line no-undef
+  mpc.connect(hostname, computation_id, options, computes, function (id, cols) {
+    var schema = 'Party ' + (id - computes.length - 1) + ': ' + cols.join(' | ') + '<br/>';
+    document.getElementById('schema').innerHTML += schema;
+  });
+}
+
+// eslint-disable-next-line no-unused-vars
+function submit() {
+  $('#output').append('<p>Starting...</p>');
+  $('#submit').attr('disabled', true);
+
+  // eslint-disable-next-line no-undef
+  generateTable(mpc.compute());
+}
+
+/**
+ * Helpers for HTML data generation and parsing
+ */
+function generateTable(result) {
+  result.promise.then(function (data) {
+    var cols = result.cols;
+
+    var table = '<br/><table>';
+    // Header
+    table += '<tr>';
+    for (var i = 0; i < cols.length; i++) {
+      table += '<th><input type="text" disabled="disabled" value="'+cols[i]+'"></th>';
+    }
+    table += '</tr>';
+
+    // Generate Body
+    for (var j = 0; j < data.length; j++) {
+      table += '<tr>';
+      for (var k = 0; k < cols.length; k++) {
+        var val = data[j][cols[k]];
+        var input = '<input type="text" disabled="disabled" value="'+val+'">';
+        table += '<td>' + input + '</td>';
+      }
+      table += '</tr>';
+    }
+
+    table += '</table>';
+    $('#output').html(table);
+  });
+}
\ No newline at end of file
diff --git a/presentation/table-join-filter-count/analyst/mpc.js b/presentation/table-join-filter-count/analyst/mpc.js
new file mode 100644
index 000000000..5821ef18a
--- /dev/null
+++ b/presentation/table-join-filter-count/analyst/mpc.js
@@ -0,0 +1,59 @@
+var GROUP_BY_DOMAIN = [1, 2, 3];
+
+(function (exports) {
+  var jiff_instance;
+  var computes;
+  var schemas = {};
+
+  /**
+   * Connect to the server and initialize the jiff instance
+   */
+  exports.connect = function (hostname, computation_id, options, _computes, schema_callback) {
+    computes = _computes;
+    var opt = Object.assign({}, options);
+
+    // eslint-disable-next-line no-undef
+    jiff_instance = jiff.make_jiff(hostname, computation_id, opt);
+    jiff_instance.listen('headers', function (id, cols) {
+      cols = JSON.parse(cols);
+      schemas[id] = cols;
+
+      if (id > computes.length) {
+        schema_callback(id, cols);
+      }
+    });
+  };
+
+  /**
+   * The MPC computation
+   */
+  exports.compute = function (cols, data) {
+    jiff_instance.emit('compute', computes, '', false);
+
+    var inputs = [];
+    for (var i = computes.length + 2; i <= jiff_instance.party_count; i++) {
+      inputs.push(i);
+    }
+
+    // Schema
+    var output_schema = ['GROUP BY', 'AVG'];
+
+    // Receive result
+    var promises = [];
+    for (var g = 0; g < GROUP_BY_DOMAIN.length; g++) {
+      var promise1 = jiff_instance.receive_open(computes);
+      var promise2 = jiff_instance.receive_open(computes);
+
+      (function scope(g) {
+        promises.push(Promise.all([promise1, promise2]).then(function (res) {
+          var obj = {};
+          obj[output_schema[0] = GROUP_BY_DOMAIN[g];
+          obj[output_schema[1]] = res[1] > 0 ? res[0] / res[1] : '-';
+          return obj;
+        }));
+      }(g));
+    }
+
+    return { promise: Promise.all(promises), cols: output_schema };
+  };
+}(this.mpc = {}));
diff --git a/presentation/table-join-filter-count/client.html b/presentation/table-join-filter-count/client.html
deleted file mode 100644
index a4277bddf..000000000
--- a/presentation/table-join-filter-count/client.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!-- Basic UI for running the demo in the browser -->
-
-<html>
-  <head>
-    <title>Sum integers under MPC</title>
-    <style>
-      .error {
-        color: #FF0000;
-      }
-    </style>
-    <script src="https://code.jquery.com/jquery-1.11.1.js"></script>
-    <script src="/socket.io/socket.io.js"></script>
-    <script src="/lib/sodium.js"></script>
-    <script src="/lib/jiff-client.js"></script>
-
-    <!-- Contains UI Handlers and Input Checks -->
-    <script type="text/javascript" src="./client.js"></script>
-
-    <!-- Contains the MPC implementation -->
-    <script type="text/javascript" src="./mpc.js"></script>
-  </head>
-  <body>
-    <h1>Connect JIFF</h1>
-    <label for="computation_id">Computation ID</label><input id="computation_id" value="test"></input><br/><br/>
-    <label for="count">Party Count<label> <input id="count" pattern="[0-9]*" value="2" disabled="disabled"><br/><br/>
-    <label for="role">Party Role<label>
-    <select id="role">
-      <option value="1">Provide Gender</option>
-      <option value="2">Provide Income</option>
-    </select>
-    &nbsp; <button id="connectButton" onclick="connect();">Connect</button>
-    <br/><br/>
-    <hr/>
-    <h1>Join / Filter / Group By under MPC</h1>
-    <label for="size">Enter your table's size</label> <input id="size" pattern="[0-9]+">
-    &nbsp; <button id="submit" onclick="generateTable(document.getElementById('size').value)" disabled="disabled">Input</button>
-    
-    <br>
-    <div id="input_area">
-    
-    </div>    
-    <button onclick="submit();" disabled="disabled" id="button">Submit</button><br/>
-    <div id="output"></div>
-  </body>
-</html>
diff --git a/presentation/table-join-filter-count/client.js b/presentation/table-join-filter-count/client.js
deleted file mode 100644
index e421de510..000000000
--- a/presentation/table-join-filter-count/client.js
+++ /dev/null
@@ -1,139 +0,0 @@
-/**
- * Do not modify this file unless you have to.
- * This file has UI handlers.
- */
-
-// eslint-disable-next-line no-unused-vars
-function connect() {
-  $('#connectButton').prop('disabled', true);
-  var computation_id = $('#computation_id').val();
-  var party_count = parseInt($('#count').val());
-  var party_id = parseInt($('#role').val());
-
-  if (isNaN(party_count)) {
-    $('#output').append('<p class=\'error\'>Party count must be a valid number!</p>');
-    $('#connectButton').prop('disabled', false);
-  } else {
-    var options = { party_count: party_count, party_id: party_id };
-    options.onError = function (error) {
-      $('#output').append('<p class=\'error\'>'+error+'</p>');
-    };
-    options.onConnect = function () {
-      $('#button').attr('disabled', false);
-      $('#submit').attr('disabled', false);
-      $('#output').append('<p>All parties Connected!</p>');
-    };
-
-    var hostname = window.location.hostname.trim();
-    var port = window.location.port;
-    if (port == null || port === '') {
-      port = '80';
-    }
-    if (!(hostname.startsWith('http://') || hostname.startsWith('https://'))) {
-      hostname = 'http://' + hostname;
-    }
-    if (hostname.endsWith('/')) {
-      hostname = hostname.substring(0, hostname.length-1);
-    }
-    if (hostname.indexOf(':') > -1 && hostname.lastIndexOf(':') > hostname.indexOf(':')) {
-      hostname = hostname.substring(0, hostname.lastIndexOf(':'));
-    }
-
-    hostname = hostname + ':' + port;
-    // eslint-disable-next-line no-undef
-    mpc.connect(hostname, computation_id, options);
-  }
-}
-
-// eslint-disable-next-line no-unused-vars
-function submit() {
-  var party_id = parseInt($('#role').val());
-
-  var data = [];
-  var table = document.getElementById('input_table');
-  for (var i = 1; i < table.rows.length; i++) {
-    var row = table.rows[i];
-    var SSN = row.cells[0].getElementsByTagName('input')[0].value;
-    var value = row.cells[1].getElementsByTagName('input')[0].value;
-
-    SSN = parseInt(SSN.split('-').join(''));
-    if (isNaN(SSN)) {
-      $('#output').append('<p class=\'error\'>Make sure all SSNs are valid!</p>');
-      return;
-    }
-
-    if (party_id === 1) {
-      if (value !== 'M' && value !== 'F') {
-        $('#output').append('<p class=\'error\'>Gender must be M or F!</p>');
-        return;
-      }
-
-      value = value === 'F' ? 1 : 0;
-    }
-
-    data.push({ SSN: SSN, value: value });
-  }
-
-  _submit(data);
-}
-
-function _submit(SSNs, vals) {
-  $('#button').attr('disabled', true);
-  $('#submit').attr('disabled', true);
-  $('#output').append('<p>Starting...</p>');
-  // eslint-disable-next-line no-undef
-  var promise = mpc.compute(SSNs, vals);
-  promise.then(handleResult);
-}
-
-function handleResult(result) {
-  var HEADERS = [ 'GENDER', 'NUMBER OF PEOPLE WITH INCOME > 1000' ];
-
-  var table = '<table>';
-  // Header
-  table += '<tr>';
-  for (var i = 0; i < HEADERS.length; i++) {
-    table += '<th>'+HEADERS[i]+'</th>';
-  }
-  table += '</tr>';
-
-  // Generate Body
-  for (var j = 0; j < result.length; j++) {
-    table += '<tr>';
-    table += '<td>' + result[j].gender + '</td>';
-    table += '<td>' + result[j].count + '</td>';
-    table += '</tr>';
-  }
-
-  table += '</table>';
-  $('#output').html(table);
-  $('#submit').attr('disabled', false);
-  $('#button').attr('disabled', false);
-}
-
-function generateTable(size) {
-  var HEADERS = [ 'SSN' ];
-  var party_id = parseInt($('#role').val());
-  HEADERS[1] = party_id === 1 ? 'GENDER' : 'INCOME';
-
-  var table = '<br/><table id="input_table">';
-  // Header
-  table += '<tr>';
-  for (var i = 0; i < HEADERS.length; i++) {
-    table += '<th>'+HEADERS[i]+'</th>';
-  }
-  table += '</tr>';
-
-  // Generate Body
-  for (var j = 0; j < size; j++) {
-    table += '<tr>';
-    for (var k = 0; k < HEADERS.length; k++) {
-      var input = '<input type="text">';
-      table += '<td>' + input + '</td>';
-    }
-    table += '</tr>';
-  }
-
-  table += '</table>';
-  $('#input_area').html(table);
-}
diff --git a/presentation/table-join-filter-count/compute/join.js b/presentation/table-join-filter-count/compute/join.js
new file mode 100644
index 000000000..e4bd25c4e
--- /dev/null
+++ b/presentation/table-join-filter-count/compute/join.js
@@ -0,0 +1,51 @@
+var binary_search = function (jiff_instance, id, table, schema) {
+  var idCol = schema[0];
+  var valCol = schema[1];
+
+  while (table.length > 1) {
+    // comparison
+    var mid = Math.floor(table.length / 2);
+    var cmp = id.slt(table[mid][idCol]);
+
+    // Slice array in half, choose slice depending on cmp
+    var nTable = [];
+    for (var i = 0; i < mid; i++) {
+      var obj = {};
+      obj[idCol] = cmp.if_else(table[i][idCol], table[mid + i][idCol]);
+      obj[valCol] = cmp.if_else(table[i][valCol], table[mid + i][valCol]);
+      nTable.push(obj);
+    }
+
+    // watch out for off by 1 errors if length is odd.
+    if (2 * mid < table.length) {
+      var obj2 = {};
+      obj2[idCol] = table[2 * mid][idCol];
+      obj2[valCol] = table[2 * mid][valCol];
+      nTable.push(obj2);
+    }
+
+    table = nTable;
+  }
+
+  var row = table[0];
+  var found = row[idCol].seq(id);
+  var val = found.if_else(row[valCol], 0);
+  return { found: found, val: val };
+};
+
+module.exports = function (jiff_instance, table1, table2, schema1, schema2) {
+  for (var d = 0; d < table1.length; d++) {
+    var row = table1[d];
+    var id = row[schema1[0]];
+    var res = binary_search(jiff_instance, id, table2, schema2);
+
+    var found = res.found;
+    for (var i = 2; i < schema1.length; i++) {
+      var col = schema1[i];
+      row[col] = found.if_else(row[col], 0);
+    }
+    row[schema2[1]] = res.val;
+  }
+
+  return table1;
+};
\ No newline at end of file
diff --git a/presentation/table-join-filter-count/compute/mpc.js b/presentation/table-join-filter-count/compute/mpc.js
new file mode 100644
index 000000000..ff5afabde
--- /dev/null
+++ b/presentation/table-join-filter-count/compute/mpc.js
@@ -0,0 +1,181 @@
+var FILTER_VALUE = 1;
+var GROUP_BY_DOMAIN = [1, 2, 3];
+
+// Configurations
+var config = require('../config.json');
+var computes = [];
+for (var c = 1; c <= config.compute; c++) {
+  computes.push(c);
+}
+var analyst = computes.length + 1;
+var inputs = [];
+for (var i = config.compute + 2; i <= config.total; i++) {
+  inputs.push(i);
+}
+
+// Schemas
+var schemas = {};
+
+/**
+ * Connect to the server and initialize the jiff instance
+ */
+exports.connect = function (hostname, computation_id, options) {
+  var opt = Object.assign({}, options);
+  var jiff = require('../../../lib/jiff-client');
+
+  // eslint-disable-next-line no-undef
+  var jiff_instance = jiff.make_jiff(hostname, computation_id, opt);
+  jiff_instance.listen('headers', function (id, cols) {
+    cols = JSON.parse(cols);
+    schemas[id] = cols;
+  });
+};
+
+function transform(table) {
+  var nTable = [];
+  for (var key in table) {
+    if (!table.hasOwnProperty(key)) {
+      continue;
+    }
+
+    for (var i = 0; i < table[key].length; i++) {
+      if (nTable[i] == null) {
+        nTable[i] = {};
+      }
+
+      nTable[i][key] = table[key][i];
+    }
+  }
+  return nTable;
+}
+
+/**
+ * The MPC computation
+ */
+exports.compute = function (jiff_instance) {
+  var join = require('./join.js');
+
+  // ids
+  var in0 = inputs[0];
+  var in1 = inputs[1];
+  var in2 = inputs[2];
+  var in3 = inputs[3];
+
+  // Receive shares
+  var promises = [];
+  for (var i = 0; i < inputs.length; i++) {
+    var input_id = inputs[i];
+    var party_promises = [];
+    for (var c = 0; c < schemas[input_id].length; c++) {
+      party_promises.push(jiff_instance.share_array([], null, null, computes, [ input_id ]));
+    }
+
+    (function scope(input_id) {
+      var promise = Promise.all(party_promises).then(function (results) {
+
+        var matrix = {};
+        for (var k = 0; k < schemas[input_id].length; k++) {
+          var col = schemas[input_id][k];
+          matrix[col] = results[k][input_id];
+        }
+        return matrix;
+      });
+      promises.push(promise);
+    }(input_id));
+  }
+
+  // Begin Work
+  Promise.all(promises).then(function (results) {
+    // Formatting
+    var matrices = {};
+    for (var i = 0; i < inputs.length; i++) {
+      matrices[inputs[i]] = results[i];
+    }
+
+    // Concatenate first and second parties input
+    for (var c = 0; c < schemas[in0].length; c++) {
+      var col0 = schemas[in0][c];
+      var col1 = schemas[in1][c];
+      matrices[in1][col1] = matrices[in0][col0].concat(matrices[in1][col1]);
+    }
+    delete matrices[in0];
+    return matrices;
+
+  }).then(function (matrices) {
+
+    // projections
+    for (var p = 1; p < inputs.length; p++) {
+      var input_id = inputs[p];
+      for (var c = 2; c < schemas[input_id].length; c++) {
+        delete matrices[input_id][schemas[input_id][c]];
+      }
+
+      matrices[input_id] = transform(matrices[input_id]);
+    }
+
+    return matrices;
+
+  }).then(function (matrices) {
+    // have 3 tables, each containing [id, <col>]
+    var table = join(jiff_instance, matrices[in1], matrices[in2], schemas[in1], schemas[in2]);
+    table = join(jiff_instance, table, matrices[in3], schemas[in1].concat([schemas[in2][1]]), schemas[in3]);
+    return table;
+  }).then(function (table) {
+    // Output is an average and a group.
+    var output_schema = [schemas[in1][1], schemas[in3][1]];
+
+    // Filter
+    var filter_key = schemas[in2][1];
+    var avg_key = output_schema[0];
+    var group_key = output_schema[1];
+    for (var i = 0; i < table.length; i++) {
+      var row = table[i];
+      var outrow = {};
+
+      var condition = row[filter_key].ceq(FILTER_VALUE);
+      outrow[avg_key] = row[avg_key];
+      outrow[group_key] = condition.if_else(row[group_key], 0);
+
+      table[i] = outrow;
+    }
+    return table;
+
+  }).then(function (table) {
+    // Output is an average and a group.
+    var output_schema = [schemas[in1][1], schemas[in3][1]];
+
+    // Group by and average
+    var avg_col = [];
+    var count_col = [];
+
+    var avg_key = output_schema[0];
+    var group_key = output_schema[1];
+    for (var z = 0; z < GROUP_BY_DOMAIN.length; z++) {
+      avg_col.push(0);
+      count_col.push(0);
+    }
+
+    for (var d = 0; d < table.length; d++) {
+      var row = table[d];
+      for (var g = 0; g < GROUP_BY_DOMAIN.length; g++) {
+        var condition = row[group_key].ceq(GROUP_BY_DOMAIN[g]);
+        var if_ = condition.if_else(row[avg_key], 0);
+
+        avg_col[g] = if_.add(avg_col[g]);
+        count_col[g] = condition.add(count_col[g]);
+      }
+    }
+
+    return { avg: avg_col, count: count_col };
+  }).then(function (results) {
+    var output_schema = ['avg', 'count'];
+    // All is done, open the result.
+    for (var gi = 0; gi < GROUP_BY_DOMAIN.length; gi++) {
+      for (var si = 0; si < output_schema.length; si++) {
+        jiff_instance.open(results[output_schema[si]][gi], [analyst]);
+      }
+    }
+  }).catch(function (err) {
+    console.log(err);
+  });
+};
diff --git a/presentation/table-join-filter-count/compute/party.js b/presentation/table-join-filter-count/compute/party.js
new file mode 100644
index 000000000..7c45aeae8
--- /dev/null
+++ b/presentation/table-join-filter-count/compute/party.js
@@ -0,0 +1,17 @@
+/**
+ * Do not change this unless you have to.
+ * This code parses input command line arguments,
+ * and calls the appropriate initialization and MPC protocol from ./mpc.js
+ */
+var mpc = require('./mpc');
+var config = require('../config.json');
+
+// JIFF options
+var options = {
+  onConnect: mpc.compute,
+  initialization: {role: 'compute'},
+  party_count: config.total
+};
+
+// Connect
+mpc.connect('http://localhost:8080', config.computation_id, options);
diff --git a/presentation/table-join-filter-count/config.json b/presentation/table-join-filter-count/config.json
new file mode 100644
index 000000000..150f583f1
--- /dev/null
+++ b/presentation/table-join-filter-count/config.json
@@ -0,0 +1,5 @@
+{
+  "computation_id": "test",
+  "compute": 3,
+  "total": 8
+}
\ No newline at end of file
diff --git a/presentation/table-join-filter-count/input/input.html b/presentation/table-join-filter-count/input/input.html
new file mode 100644
index 000000000..cac6a0bfd
--- /dev/null
+++ b/presentation/table-join-filter-count/input/input.html
@@ -0,0 +1,63 @@
+<!-- Basic UI for running the demo in the browser -->
+
+<html>
+  <head>
+    <title>Sum integers under MPC</title>
+    <style>
+      .error {
+        color: #FF0000;
+      }
+
+      td, th {
+        border: solid 1px darkgray;
+      }
+
+      th input, td input {
+        width: 70px;
+      }
+
+      .party5 {
+        background-color: #3e999f;
+      }
+      .party6 {
+        background-color: #710B02;
+      }
+      .party7 {
+        background-color: #cccccc;
+      }
+      .party8 {
+        background-color: #a5871f;
+      }
+    </style>
+    <script src="https://code.jquery.com/jquery-1.11.1.js"></script>
+    <script src="/socket.io/socket.io.js"></script>
+    <script src="/lib/sodium.js"></script>
+    <script src="/lib/jiff-client.js"></script>
+
+    <!-- Contains UI Handlers and Input Checks -->
+    <script type="text/javascript" src="/static/input/input.js"></script>
+
+    <!-- Contains the MPC implementation -->
+    <script type="text/javascript" src="/static/input/mpc.js"></script>
+  </head>
+  <body class="party{{id}}">
+    <h1>Input party {{ id - config.compute - 1}}</h1>
+    <h3>Join / Filter / Group By under MPC</h3>
+
+    <label for="cols">Enter the number of columns</label> <input id="cols" pattern="[0-9]+"> <br/>
+    <label for="rows">Enter the number of rows&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label> <input id="rows" pattern="[0-9]+"> <br/>
+    <button id="generate" onclick="generateTable(document.getElementById('cols').value, document.getElementById('rows').value)">Input</button>
+    <br/><br/>
+
+
+    <div id="input_area">
+
+    </div>
+    <button onclick="submit();" disabled="disabled" id="submit">Submit</button><br/>
+    <div id="output"></div>
+  </body>
+
+  <script type="text/javascript">
+    connect({{id}}, {{config.total}}, {{config.compute}}, '{{ config.computation_id }}');
+  </script>
+</html>
diff --git a/presentation/table-join-filter-count/input/input.js b/presentation/table-join-filter-count/input/input.js
new file mode 100644
index 000000000..ff647ec3a
--- /dev/null
+++ b/presentation/table-join-filter-count/input/input.js
@@ -0,0 +1,121 @@
+/**
+ * Do not modify this file unless you have to.
+ * This file has UI handlers.
+ */
+
+// eslint-disable-next-line no-unused-vars
+var computes = [];
+function connect(party_id, party_count, compute_count, computation_id) {
+  def = defaults[party_id];
+
+  // Compute parties ids
+  for (var c = 1; c <= compute_count; c++) {
+    computes.push(c);
+  }
+
+  // jiff options
+  var options = { party_count: party_count, party_id: party_id };
+  options.onError = function (error) {
+    $('#output').append('<p class=\'error\'>'+error+'</p>');
+  };
+
+  // host name
+  var hostname = window.location.hostname.trim();
+  var port = window.location.port;
+  if (port == null || port === '') {
+    port = '80';
+  }
+  if (!(hostname.startsWith('http://') || hostname.startsWith('https://'))) {
+    hostname = 'http://' + hostname;
+  }
+  if (hostname.endsWith('/')) {
+    hostname = hostname.substring(0, hostname.length-1);
+  }
+  if (hostname.indexOf(':') > -1 && hostname.lastIndexOf(':') > hostname.indexOf(':')) {
+    hostname = hostname.substring(0, hostname.lastIndexOf(':'));
+  }
+
+  hostname = hostname + ':' + port;
+
+  // eslint-disable-next-line no-undef
+  var jiff_instance = mpc.connect(hostname, computation_id, options, computes);
+
+  // Display connection
+  jiff_instance.wait_for(computes, function () {
+    $('#output').append('<p>Connected!</p>');
+  });
+}
+
+// eslint-disable-next-line no-unused-vars
+function submit() {
+  $('#output').append('<p>Starting...</p>');
+  $('#submit').attr('disabled', true);
+
+  var parsed = parseInput();
+  // eslint-disable-next-line no-undef
+  mpc.compute(parsed['cols'], parsed['data']);
+
+  $('#output').append('<p>Shared data successfully!</p>');
+}
+
+/**
+ * Helpers for HTML data generation and parsing
+ */
+function generateTable(cols, rows) {
+  $('#generate').attr('disabled', true);
+  $('#submit').attr('disabled', false);
+
+  var table = '<br/><table id="input_table">';
+  // Header
+  table += '<tr>';
+  for (var i = 0; i < cols; i++) {
+    table += '<th><input type="text" value="'+i+'"></th>';
+  }
+  table += '</tr>';
+
+  // Generate Body
+  for (var j = 0; j < rows; j++) {
+    table += '<tr>';
+    for (var k = 0; k < cols; k++) {
+      var input = '<input type="text" value="'+def[j*cols+k]+'">';
+      table += '<td>' + input + '</td>';
+    }
+    table += '</tr>';
+  }
+
+  table += '</table>';
+  $('#input_area').html(table);
+}
+function parseInput() {
+  var cols = [];
+  var data = [];
+
+  var table = document.getElementById('input_table');
+
+  // headers
+  for (var c = 0; c < table.rows[0].cells.length; c++) {
+    var col = table.rows[0].cells[c].getElementsByTagName('input')[0].value;
+    cols.push(col);
+  }
+
+  // body
+  for (var i = 1; i < table.rows.length; i++) {
+    var row = table.rows[i];
+    var obj = {};
+    for (var j = 0; j < cols.length; j++) {
+      var cell = row.cells[j];
+      obj[cols[j]] = parseInt(cell.getElementsByTagName('input')[0].value);
+    }
+    data.push(obj);
+  }
+
+  return { cols: cols, data: data};
+}
+
+var defaults = {
+  5: [ 1, 10, 2, 20 ],
+  6: [ 3, 30 ],
+  7: [ 1, 1, 2, 2, 3, 1 ],
+  8: [ 1, 1, 2, 2, 3, 1 ]
+};
+var def;
\ No newline at end of file
diff --git a/presentation/table-join-filter-count/input/mpc.js b/presentation/table-join-filter-count/input/mpc.js
new file mode 100644
index 000000000..ad0b5a5e1
--- /dev/null
+++ b/presentation/table-join-filter-count/input/mpc.js
@@ -0,0 +1,48 @@
+(function (exports) {
+  var jiff_instance;
+  var computes;
+
+  /**
+   * Connect to the server and initialize the jiff instance
+   */
+  exports.connect = function (hostname, computation_id, options, _computes) {
+    computes = _computes;
+    var opt = Object.assign({}, options);
+
+    // eslint-disable-next-line no-undef
+    jiff_instance = jiff.make_jiff(hostname, computation_id, opt);
+    return jiff_instance;
+  };
+
+  /**
+   * The MPC computation
+   */
+  exports.compute = function (cols, data) {
+    var scoped_cols = [];
+    for (var i = 0; i < cols.length; i++) {
+      scoped_cols[i] = (jiff_instance.id - computes.length - 1) + '.' + cols[i];
+    }
+
+    // Compute party and analyst ids.
+    var copy = computes.slice();
+    copy.push(computes.length + 1);
+
+    // Send headers / schema
+    jiff_instance.emit('headers', copy, JSON.stringify(scoped_cols), false);
+
+    // Sort by key
+    data.sort(function (x, y) {
+      return x[cols[0]] - y[cols[0]];
+    });
+
+    // Split Array
+    for (var c = 0; c < cols.length; c++) {
+      var column = [];
+      for (var d = 0; d < data.length; d++) {
+        column.push(data[d][cols[c]]);
+      }
+
+      jiff_instance.share_array(column, null, computes.length, computes, [ jiff_instance.id ]);
+    }
+  };
+}(this.mpc = {}));
diff --git a/presentation/table-join-filter-count/mpc.js b/presentation/table-join-filter-count/mpc.js
deleted file mode 100644
index 0a7cd7bc2..000000000
--- a/presentation/table-join-filter-count/mpc.js
+++ /dev/null
@@ -1,101 +0,0 @@
-(function (exports, node) {
-  var saved_instance;
-
-  /**
-   * Connect to the server and initialize the jiff instance
-   */
-  exports.connect = function (hostname, computation_id, options) {
-    var opt = Object.assign({}, options);
-
-    if (node) {
-      // eslint-disable-next-line no-undef
-      jiff = require('../../lib/jiff-client');
-    }
-
-    // eslint-disable-next-line no-undef
-    saved_instance = jiff.make_jiff(hostname, computation_id, opt);
-    return saved_instance;
-  };
-
-  var binary_search = function (jiff_instance, element, keys, values) {
-    if (keys.length === 0) {
-      var found = keys[0].seq(element);
-      var val = found.if_else(values[0], jiff_instance.Zp - 1);
-      return { found: found, val: val };
-    }
-
-    // comparison
-    var mid = Math.floor(keys.length/ 2);
-    var cmp = element.slt(keys[mid]);
-
-    // Slice array in half, choose slice depending on cmp
-    var nKeys = [], nVals = values;
-    for (var i = 0; i < mid; i++) {
-      nKeys[i] = cmp.if_else(keys[i], keys[mid+i]);
-      nVals[i] = cmp.if_else(values[i], values[mid+i]);
-    }
-
-    // watch out for off by 1 errors if length is odd.
-    if (2*mid < keys.length) {
-      nKeys[mid] = keys[2*mid];
-      nVals[mid] = values[2*mid]
-    }
-
-    return binary_search(jiff_instance, element, nKeys, nVals);
-  };
-
-  var join = function (jiff_instance, SSNs1, vals1, SSNs2, vals2, ind1, ind2) {
-    var data = [];
-    for (var i = 0; i < SSNs1.length; i++) {
-      var res = binary_search(SSNs1[i], SSNs2, vals2);
-
-      var obj = {};
-      obj[ind1] = res.found.if_else(vals1[i], jiff_instance.Zp - 1);
-      obj[ind2] = res.val;
-      data.push(obj);
-    }
-
-    return data;
-  };
-
-  /**
-   * The MPC computation
-   */
-  exports.compute = function (data, jiff_instance) {
-    if (jiff_instance == null) {
-      jiff_instance = saved_instance;
-    }
-
-    // Sort by SSN
-    data.sort(function (x, y) {
-      return x.SSN - y.SSN;
-    });
-
-    // Split Array
-    var SSNs = [];
-    var vals = [];
-    for (var d = 0; d < data.length; d++) {
-      SSNs.push(data[d].SSN);
-      vals.push(data[d].value);
-    }
-
-    var promise1 = jiff_instance.share_array(SSNs);
-    var promise2 = jiff_instance.share_array(vals);
-    Promise.all([promise1, promise2]).then(function (shares) {
-      var SSNs1 = shares[0][1];
-      var SSNs2 = shares[0][2];
-      var vals1 = shares[0][1];
-      var vals2 = shares[0][2];
-
-      var data = [];
-      if (SSNs1.length < SSNs2.length) {
-        data = join(jiff_instance, SSNs1, vals1, SSNs2, vals2, 1, 2);
-      } else {
-        data = join(jiff_instance, SSNs2, vals2, SSNs1, vals1, 2, 1);
-      }
-    });
-
-    // Return a promise to the final output(s)
-    return jiff_instance.open();
-  };
-}((typeof exports === 'undefined' ? this.mpc = {} : exports), typeof exports !== 'undefined'));
diff --git a/presentation/table-join-filter-count/party.js b/presentation/table-join-filter-count/party.js
deleted file mode 100644
index a1d8f7189..000000000
--- a/presentation/table-join-filter-count/party.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Do not change this unless you have to.
- * This code parses input command line arguments,
- * and calls the appropriate initialization and MPC protocol from ./mpc.js
- */
-
-console.log('Command line arguments: <input> [<party count> [<computation_id> [<party id>]]]]');
-
-var mpc = require('./mpc');
-
-// Read Command line arguments
-var input = parseInt(process.argv[2], 10);
-
-var party_count = process.argv[3];
-if (party_count == null) {
-  party_count = 2;
-} else {
-  party_count = parseInt(party_count);
-}
-
-var computation_id = process.argv[4];
-if (computation_id == null) {
-  computation_id = 'test';
-}
-
-var party_id = process.argv[5];
-if (party_id != null) {
-  party_id = parseInt(party_id, 10);
-}
-
-// JIFF options
-var options = {party_count: party_count, party_id: party_id};
-options.onConnect = function (jiff_instance) {
-  var promise = mpc.compute(input);
-
-  promise.then(function (v) {
-    console.log(v);
-    jiff_instance.disconnect(true);
-  });
-};
-
-// Connect
-mpc.connect('http://localhost:8080', computation_id, options);
diff --git a/presentation/table-join-filter-count/server.js b/presentation/table-join-filter-count/server.js
index 440ce621c..284c86033 100644
--- a/presentation/table-join-filter-count/server.js
+++ b/presentation/table-join-filter-count/server.js
@@ -1,20 +1,64 @@
 var express = require('express');
 var app = express();
+
 var http = require('http').Server(app);
+http.listen(8080, function () {
+  console.log('listening on *:8080');
+});
 
-//Serve static files
-//Configure App
-app.use('/demos', express.static('demos'));
-app.use('/lib', express.static('lib'));
-app.use('/lib/ext', express.static('lib/ext'));
+// nunjucks for rendering html template
+var nunjucks = require('nunjucks');
+nunjucks.configure(__dirname, {
+  autoescape: true,
+  express: app
+});
 
-require('../../lib/jiff-server').make_jiff(http, { logs:true });
+// read configurations
+var config = require('./config.json');
 
-// Serve static files.
-http.listen(8080, function () {
-  console.log('listening on *:8080');
+//Serve static files
+app.use('/lib', express.static(__dirname + '/../../lib'));
+
+// Server input and analyst files
+app.use('/static/input', express.static(__dirname + '/input'));
+app.use('/static/analyst', express.static(__dirname + '/analyst'));
+app.get('/input/:id', function (req, res) {
+  var party_id = parseInt(req.params.id, 10);
+  res.render('input/input.html', {id: party_id + config.compute + 1, config: config});
 });
+app.get('/analyst', function (req, res) {
+  res.render('analyst/analyst.html', {id: config.compute + 1, config: config});
+});
+
+// Manage roles / IDS
+// Keep track of assigned ids
+var assignedCompute = 1;
+var initialize = function (jiff, computation_id, msg, params) {
+  if (params.party_id != null) {
+    return params;
+  }
+
+  if (msg.role === 'input') {
+    return params;
+  }
+  if (msg.role === 'analyst') {
+    params['party_id'] = config.compute + 1;
+    return params;
+  }
+  if (msg.role === 'compute' && assignedCompute <= config.compute) {
+    params['party_id'] = assignedCompute;
+    assignedCompute++;
+    return params;
+  }
+
+  throw new Error('Unrecognized role and party id options');
+};
+
+require('../../lib/jiff-server').make_jiff(http, {logs: true, hooks: { beforeInitialization: [initialize] }});
+
 
-console.log('Direct your browser to *:8080/demos/table-join-filter-count/client.html.');
-console.log('To run a node.js based party: node demos/table-join-filter-count/party <input>');
-console.log();
+// Instructions
+console.log('Direct your browser to http://localhost/input/<party-id> for inputing data');
+console.log('Direct your browser to http://localhost/analyst for analyst UI');
+console.log('Run compute parties with node compute/party.js');
+console.log();
\ No newline at end of file
diff --git a/presentation/table-join-filter-count/test.js b/presentation/table-join-filter-count/test.js
deleted file mode 100644
index 5fef4b897..000000000
--- a/presentation/table-join-filter-count/test.js
+++ /dev/null
@@ -1,131 +0,0 @@
-// Chai
-var assert = require('chai').assert;
-
-var mpc = require('./mpc.js');
-
-// Generic Testing Parameters
-var showProgress = false;
-var party_count = 3;
-var parallelismDegree = 100; // Max number of test cases running in parallel
-var n = 1000;
-var Zp = null;
-
-// Parameters specific to this demo
-var maxValue = 1000;
-
-
-/**
- * CHANGE THIS: Generate inputs for your tests
- * Should return an object with this format:
- * {
- *   'party_id': [ 'test1_input', 'test2_input', ...]
- * }
- */
-function generateInputs(party_count) {
-  var inputs = {};
-  var i;
-
-  for (i = 0; i < party_count; i++) {
-    inputs[i+1] = [];
-  }
-
-  for (i = 0; i < party_count; i++) {
-    for (var j = 0; j < n; j++) {
-      inputs[i+1].push(Math.floor((Math.random() * maxValue)));
-    }
-  }
-  return inputs;
-}
-
-/**
- * CHANGE THIS: Compute the expected results not in MPC
- * @param {object} inputs - same format as generateInputs output.
- * Should return a single array with the expected result for every test in order
- *   [ 'test1_output', 'test2_output', ... ]
- */
-function computeResults(inputs) {
-  var results = [];
-
-  for (var j = 0; j < n; j++) {
-    var sum = 0;
-    for (var i = 1; i <= party_count; i++) {
-      sum += inputs[i][j];
-    }
-    results.push(sum);
-  }
-  return results;
-}
-
-/**
- * Do not change unless you have to.
- */
-// eslint-disable-next-line no-undef
-describe('Test', function () {
-  this.timeout(0); // Remove timeout
-
-  // eslint-disable-next-line no-undef
-  it('Exhaustive', function (done) {
-    var count = 0;
-
-    var inputs = generateInputs(party_count);
-    var realResults = computeResults(inputs);
-
-    var onConnect = function (jiff_instance) {
-      var partyInputs = inputs[jiff_instance.id];
-
-      var testResults = [];
-      (function one_test_case(j) {
-        if (jiff_instance.id === 1 && showProgress) {
-          console.log('\tStart ', j > partyInputs.length ? partyInputs.length : j, '/', partyInputs.length);
-        }
-
-        if (j < partyInputs.length) {
-          var promises = [];
-          for (var t = 0; t < parallelismDegree && (j + t) < partyInputs.length; t++) {
-            promises.push(mpc.compute(partyInputs[j + t], jiff_instance));
-          }
-
-          Promise.all(promises).then(function (parallelResults) {
-            for (var t = 0; t < parallelResults.length; t++) {
-              testResults.push(parallelResults[t]);
-            }
-
-            one_test_case(j + parallelismDegree);
-          });
-
-          return;
-        }
-
-        // If we reached here, it means we are done
-        count++;
-        for (var i = 0; i < testResults.length; i++) {
-          // construct debugging message
-          var ithInputs = inputs[1][i] + '';
-          for (var p = 2; p <= party_count; p++) {
-            ithInputs += ',' + inputs[p][i];
-          }
-          var msg = 'Party: ' + jiff_instance.id + '. inputs: [' + ithInputs + ']';
-
-          // assert results are accurate
-          try {
-            assert.deepEqual(testResults[i].toString(), realResults[i].toString(), msg);
-          } catch (assertionError) {
-            done(assertionError);
-            done = function () {
-            };
-          }
-        }
-
-        jiff_instance.disconnect(true);
-        if (count === party_count) {
-          done();
-        }
-      })(0);
-    };
-
-    var options = { party_count: party_count, onError: console.log, onConnect: onConnect, Zp: Zp };
-    for (var i = 0; i < party_count; i++) {
-      mpc.connect('http://localhost:8080', 'mocha-test', options);
-    }
-  });
-});
\ No newline at end of file

From ee217689caa2f4669eb22bc324acf0300be3698d Mon Sep 17 00:00:00 2001
From: Kinan Dak Al Bab <kinan.bab.14@gmail.com>
Date: Mon, 11 Feb 2019 00:26:35 -0500
Subject: [PATCH 6/9] Dirty partial fix in share_array outsourced

---
 lib/jiff-client.js | 21 +++++++++++++--------
 lib/jiff-server.js |  2 +-
 package.json       |  3 ++-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/lib/jiff-client.js b/lib/jiff-client.js
index fe9784371..16f5fd186 100644
--- a/lib/jiff-client.js
+++ b/lib/jiff-client.js
@@ -859,14 +859,19 @@
         jiff.emit(share_id + 'length', receivers_list, array.length.toString(10));
       }
 
-      jiff.listen(share_id + 'length', function (sender, message) {
-        lengths[sender] = parseInt(message, 10);
-        total++;
-        if (total === senders_list.length) {
-          jiff.remove_listener(share_id + 'length');
-          share_array_deferred.resolve(lengths);
-        }
-      });
+      if (receivers_list.indexOf(jiff.id) > -1) {
+        jiff.listen(share_id + 'length', function (sender, message) {
+          lengths[sender] = parseInt(message, 10);
+          total++;
+          if (total === senders_list.length) {
+            jiff.remove_listener(share_id + 'length');
+            share_array_deferred.resolve(lengths);
+          }
+        });
+      } else if (senders_list[0] === jiff.id && senders_list.length === 1) {
+        lengths[jiff.id] = array.length;
+        share_array_deferred.resolve(lengths);
+      }
     } else if (typeof(lengths) === 'number') {
       // All arrays are of the same length
       var l = lengths;
diff --git a/lib/jiff-server.js b/lib/jiff-server.js
index c302f0714..3efbdaaf7 100644
--- a/lib/jiff-server.js
+++ b/lib/jiff-server.js
@@ -358,7 +358,7 @@ exports.make_jiff = function (http, options) {
   };
 
   jiff.custom = function (computation_id, from_id, msg) {
-    jiff.hooks.log(jiff, 'custom from ' + computation_id + '-' + from_id + ' : ' + msg);
+    jiff.hooks.log(jiff, 'custom from ' + computation_id + '-' + from_id + ' : ' + JSON.stringify(msg));
 
     try {
       msg = jiff.execute_array_hooks('beforeOperation', [jiff, 'custom', computation_id, from_id, msg], 4);
diff --git a/package.json b/package.json
index 918fda7db..f8665d882 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,7 @@
     "jsdoc": "^3.5.5",
     "marked": "^0.3.9",
     "minimist": "^1.2.0",
-    "mocha": "^4.0.1"
+    "mocha": "^4.0.1",
+    "nunjucks": "^3.1.7"
   }
 }

From 86c809001dbfb116ca8e3d935a5e008fafa8b4dd Mon Sep 17 00:00:00 2001
From: Kinan Dak Albab <Kinan.bab.14@gmail.com>
Date: Tue, 12 Feb 2019 11:28:15 -0500
Subject: [PATCH 7/9] Table join filter counter is completed but with naturals

---
 presentation/table-join-filter-count/TODO     | 35 -------------------
 .../table-join-filter-count/analyst/mpc.js    |  2 +-
 .../table-join-filter-count/compute/mpc.js    |  2 +-
 .../table-join-filter-count/server.js         |  1 +
 4 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 presentation/table-join-filter-count/TODO

diff --git a/presentation/table-join-filter-count/TODO b/presentation/table-join-filter-count/TODO
deleted file mode 100644
index 4d8a61186..000000000
--- a/presentation/table-join-filter-count/TODO
+++ /dev/null
@@ -1,35 +0,0 @@
-1. Implement MPC algorithm:
-  * Data = [];
-  * // JOIN
-  * Loop over (SSN, Gender) in party 1 input:
-    + secret(flag), secret(INCOME) = modified binary search for SSN in party 2 input
-    + if i != -1
-      - Data.add(Gender, Income)
-    + else
-      - Data.add(2, -1) // 2 in gender means invalid entry
-  * // JOIN COMPLETE --- n log n comparison, n^2 multiplications
-
-
-  /// GOT HERE
-
-  * // FILTER
-  * Loop over (Gender, Income) in Data:
-    + if Income > SOME CONSTANT
-      - Data unchanged
-    + else
-      - Replace with (2, 0)
-  * // FILTER COMPLETE --- n comparison, n multiplication
-  * // COUNT
-  * Result = [ { gender: 'M', count: share(0) }, { gender: 'F', count: share(0) } ]
-  * Loop over (Gender, Income) in Data:
-    + cmp1 = Gender == 0
-    + cmp2 = Gender == 1
-    + Result[0].count += cmp1
-    + Result[1].count += cmp2
-  * // COUNT COMPLETE --- 2n equality checks, 2n multiplications
-
-
-
-2. party.js: parse input as CSV.
-
-3. test.js: parallel = 1, run for small random tables.
diff --git a/presentation/table-join-filter-count/analyst/mpc.js b/presentation/table-join-filter-count/analyst/mpc.js
index 5821ef18a..a69834264 100644
--- a/presentation/table-join-filter-count/analyst/mpc.js
+++ b/presentation/table-join-filter-count/analyst/mpc.js
@@ -47,7 +47,7 @@ var GROUP_BY_DOMAIN = [1, 2, 3];
       (function scope(g) {
         promises.push(Promise.all([promise1, promise2]).then(function (res) {
           var obj = {};
-          obj[output_schema[0] = GROUP_BY_DOMAIN[g];
+          obj[output_schema[0]] = GROUP_BY_DOMAIN[g];
           obj[output_schema[1]] = res[1] > 0 ? res[0] / res[1] : '-';
           return obj;
         }));
diff --git a/presentation/table-join-filter-count/compute/mpc.js b/presentation/table-join-filter-count/compute/mpc.js
index ff5afabde..ea3892b1b 100644
--- a/presentation/table-join-filter-count/compute/mpc.js
+++ b/presentation/table-join-filter-count/compute/mpc.js
@@ -67,7 +67,7 @@ exports.compute = function (jiff_instance) {
     var input_id = inputs[i];
     var party_promises = [];
     for (var c = 0; c < schemas[input_id].length; c++) {
-      party_promises.push(jiff_instance.share_array([], null, null, computes, [ input_id ]));
+      party_promises.push(jiff_instance.share_array([], null, computes.length, computes, [ input_id ]));
     }
 
     (function scope(input_id) {
diff --git a/presentation/table-join-filter-count/server.js b/presentation/table-join-filter-count/server.js
index 284c86033..9d0704bcd 100644
--- a/presentation/table-join-filter-count/server.js
+++ b/presentation/table-join-filter-count/server.js
@@ -17,6 +17,7 @@ nunjucks.configure(__dirname, {
 var config = require('./config.json');
 
 //Serve static files
+app.use('/bignumber.js', express.static(__dirname + '/../../node_modules/bignumber.js'));
 app.use('/lib', express.static(__dirname + '/../../lib'));
 
 // Server input and analyst files

From 0d60c43fe5bef485770bbdc3e29a86dc4d5b242a Mon Sep 17 00:00:00 2001
From: Kinan Dak Albab <Kinan.bab.14@gmail.com>
Date: Tue, 12 Feb 2019 11:28:33 -0500
Subject: [PATCH 8/9] Linear regression

---
 .../linear-regression/analyst/analyst.html    |  58 ++++++++++
 .../linear-regression/analyst/analyst.js      | 104 ++++++++++++++++++
 presentation/linear-regression/analyst/mpc.js |  36 ++++++
 presentation/linear-regression/compute/mpc.js |  79 +++++++++++++
 .../linear-regression/compute/party.js        |  17 +++
 presentation/linear-regression/config.json    |   5 +
 .../linear-regression/input/input.html        |  59 ++++++++++
 presentation/linear-regression/input/input.js | 103 +++++++++++++++++
 presentation/linear-regression/input/mpc.js   |  55 +++++++++
 presentation/linear-regression/server.js      |  65 +++++++++++
 10 files changed, 581 insertions(+)
 create mode 100644 presentation/linear-regression/analyst/analyst.html
 create mode 100644 presentation/linear-regression/analyst/analyst.js
 create mode 100644 presentation/linear-regression/analyst/mpc.js
 create mode 100644 presentation/linear-regression/compute/mpc.js
 create mode 100644 presentation/linear-regression/compute/party.js
 create mode 100644 presentation/linear-regression/config.json
 create mode 100644 presentation/linear-regression/input/input.html
 create mode 100644 presentation/linear-regression/input/input.js
 create mode 100644 presentation/linear-regression/input/mpc.js
 create mode 100644 presentation/linear-regression/server.js

diff --git a/presentation/linear-regression/analyst/analyst.html b/presentation/linear-regression/analyst/analyst.html
new file mode 100644
index 000000000..b4a62bd01
--- /dev/null
+++ b/presentation/linear-regression/analyst/analyst.html
@@ -0,0 +1,58 @@
+<!-- Basic UI for running the demo in the browser -->
+
+<html>
+  <head>
+    <title>Sum integers under MPC</title>
+    <style>
+      .error {
+        color: #FF0000;
+      }
+
+      td, th {
+        border: solid 1px darkgray;
+      }
+
+      th input, td input {
+        width: 70px;
+      }
+    </style>
+
+    <script src="https://code.jquery.com/jquery-1.11.1.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js"></script>
+
+    <script src="/socket.io/socket.io.js"></script>
+    <script src="/bignumber.js/bignumber.min.js"></script>
+    <script src="/lib/sodium.js"></script>
+    <script src="/lib/jiff-client.js"></script>
+    <script src="/lib/ext/jiff-client-bignumber.js"></script>
+    <script src="/lib/ext/jiff-client-fixedpoint.js"></script>
+    <script src="/lib/ext/jiff-client-negativenumber.js"></script>
+
+    <!-- Contains UI Handlers and Input Checks -->
+    <script type="text/javascript" src="/static/analyst/analyst.js"></script>
+
+    <!-- Contains the MPC implementation -->
+    <script type="text/javascript" src="/static/analyst/mpc.js"></script>
+  </head>
+  <body>
+    <h1>Analyst</h1>
+    <h3>Input Parties Schemas:</h3>
+    <div id="schema"></div>
+
+    <h3>Analysis:</h3>
+    <textarea rows="8" cols="75" placeholder="Enter your query"></textarea>
+    <br/>
+    <button onclick="submit();" id="submit">Query</button>
+    <br/>
+    <h3>Output:</h3>
+    <div id="output" style="display: none;">
+      <div style="width:300px; height:300px;">
+        <canvas id="myChart" width="400" height="400"></canvas>
+      </div>
+    </div>
+  </body>
+
+  <script type="text/javascript">
+    connect({{config.compute + 1}}, {{config.total}}, {{config.compute}}, '{{ config.computation_id }}');
+  </script>
+</html>
diff --git a/presentation/linear-regression/analyst/analyst.js b/presentation/linear-regression/analyst/analyst.js
new file mode 100644
index 000000000..be97239c1
--- /dev/null
+++ b/presentation/linear-regression/analyst/analyst.js
@@ -0,0 +1,104 @@
+/**
+ * Do not modify this file unless you have to.
+ * This file has UI handlers.
+ */
+
+// eslint-disable-next-line no-unused-vars
+var computes = [];
+function connect(party_id, party_count, compute_count, computation_id) {
+  // Compute parties ids
+  for (var c = 1; c <= compute_count; c++) {
+    computes.push(c);
+  }
+
+  // jiff options
+  var options = { party_count: party_count, party_id: party_id };
+  options.onError = function (error) {
+    $('#output').append('<p class=\'error\'>'+error+'</p>');
+  };
+  options.onConnect = function () {
+    $('#output').append('<p>Connected!</p>');
+  };
+
+  // host name
+  var hostname = window.location.hostname.trim();
+  var port = window.location.port;
+  if (port == null || port === '') {
+    port = '80';
+  }
+  if (!(hostname.startsWith('http://') || hostname.startsWith('https://'))) {
+    hostname = 'http://' + hostname;
+  }
+  if (hostname.endsWith('/')) {
+    hostname = hostname.substring(0, hostname.length-1);
+  }
+  if (hostname.indexOf(':') > -1 && hostname.lastIndexOf(':') > hostname.indexOf(':')) {
+    hostname = hostname.substring(0, hostname.lastIndexOf(':'));
+  }
+
+  hostname = hostname + ':' + port;
+
+  // eslint-disable-next-line no-undef
+  mpc.connect(hostname, computation_id, options, computes, function (id, cols) {
+    var schema = 'Party ' + (id - computes.length - 1) + ': ' + cols.join(' | ') + '<br/>';
+    document.getElementById('schema').innerHTML += schema;
+  });
+}
+
+// eslint-disable-next-line no-unused-vars
+function submit() {
+  $('#output').append('<p>Starting...</p>');
+  $('#submit').attr('disabled', true);
+
+  // eslint-disable-next-line no-undef
+  mpc.compute().then(plot);
+}
+
+/**
+ * Helpers for drawing lines in a chart
+ */
+// The limits of the graph. The minimum and maximum X and Y values.
+var minX = -5;
+var maxX = 5;
+var minY = -5;
+var maxY = 5;
+
+// Chart for drawing
+function initChart(line) {
+  var ctx = document.getElementById('myChart').getContext('2d');
+
+  var scales = {
+    yAxes: [{ ticks: { min: minY,  max: maxY, maxTicksLimit: 5 } }],
+    xAxes: [{ type: 'linear', position: 'bottom', ticks: { min: minX, max: maxX, maxTicksLimit: 20 } }]
+  };
+
+  // eslint-disable-next-line no-undef
+  var myChart = new Chart(ctx, {
+    type: 'line',
+    data: {
+      datasets: [
+        { id: 'least-line', label: 'output', data: line, fill: false, pointBackgroundColor: '#000099', borderColor: '#000099', pointRadius: 0 }
+      ]
+    },
+    options: {
+      elements: { line: { tension: 1 } },
+      scales: scales
+    }
+  });
+  myChart.update();
+}
+
+function plot(data) {
+  console.log(data);
+  var m = data.slope;
+  var p = data.yIntercept;
+
+  var points = [];
+  for (var i = minX; i <= maxX; i++) {
+    var y = m.times(i).plus(p).toNumber();
+    points.push({x: i, y: y});
+  }
+
+  $('#output').show();
+  initChart(points);
+}
\ No newline at end of file
diff --git a/presentation/linear-regression/analyst/mpc.js b/presentation/linear-regression/analyst/mpc.js
new file mode 100644
index 000000000..fd0e2b049
--- /dev/null
+++ b/presentation/linear-regression/analyst/mpc.js
@@ -0,0 +1,36 @@
+(function (exports) {
+  var jiff_instance;
+  var computes;
+
+  /**
+   * Connect to the server and initialize the jiff instance
+   */
+  exports.connect = function (hostname, computation_id, options, _computes, schema_callback) {
+    computes = _computes;
+    var opt = Object.assign({}, options);
+    opt.Zp = '33554393';
+    opt.integer_digits = 3;
+    opt.decimal_digits = 2;
+
+    // eslint-disable-next-line no-undef
+    jiff_instance = jiff.make_jiff(hostname, computation_id, opt);
+    // eslint-disable-next-line no-undef
+    jiff_instance.apply_extension(jiff_bignumber, opt);
+    // eslint-disable-next-line no-undef
+    jiff_instance.apply_extension(jiff_fixedpoint, opt);
+    // eslint-disable-next-line no-undef
+    jiff_instance.apply_extension(jiff_negativenumber, opt);
+  };
+
+  /**
+   * The MPC computation
+   */
+  exports.compute = function () {
+    var promise1 = jiff_instance.receive_open(computes);
+    var promise2 = jiff_instance.receive_open(computes);
+
+    return Promise.all([promise1, promise2]).then(function (res) {
+      return {slope: res[0], yIntercept: res[1]};
+    });
+  };
+}(this.mpc = {}));
diff --git a/presentation/linear-regression/compute/mpc.js b/presentation/linear-regression/compute/mpc.js
new file mode 100644
index 000000000..2024ec364
--- /dev/null
+++ b/presentation/linear-regression/compute/mpc.js
@@ -0,0 +1,79 @@
+// Configurations
+var decimal_digits = 2;
+
+var config = require('../config.json');
+var computes = [];
+for (var c = 1; c <= config.compute; c++) {
+  computes.push(c);
+}
+var analyst = computes.length + 1;
+var inputs = [];
+for (var i = config.compute + 2; i <= config.total; i++) {
+  inputs.push(i);
+}
+
+function fast_div(jiff_instance, x, y) {
+  return new Promise(function (resolve) {
+    jiff_instance.open(y, computes, 'main-open').then(function (y) {
+      var res = x.cdiv(200, 'main-cdiv');
+      resolve(res);
+    });
+  });
+  /*
+  return jiff_instance.open(y).then(function (y) {
+    console.log(y.toString());
+    return x.cdiv(y);
+  });
+  */
+}
+
+/**
+ * Connect to the server and initialize the jiff instance
+ */
+exports.connect = function (hostname, computation_id, options) {
+  var opt = Object.assign({}, options);
+  opt.Zp = '33554393';
+  opt.integer_digits = 3;
+  opt.decimal_digits = decimal_digits;
+
+  var jiff = require('../../../lib/jiff-client');
+  var jiff_bignumber = require('../../../lib/ext/jiff-client-bignumber');
+  var jiff_fixedpoint = require('../../../lib/ext/jiff-client-fixedpoint');
+  var jiff_negativenumber = require('../../../lib/ext/jiff-client-negativenumber');
+
+  var jiff_instance = jiff.make_jiff(hostname, computation_id, opt);
+  jiff_instance.apply_extension(jiff_bignumber, opt);
+  jiff_instance.apply_extension(jiff_fixedpoint, opt);
+  jiff_instance.apply_extension(jiff_negativenumber, opt);
+};
+
+/**
+ * The MPC computation
+ */
+exports.compute = function (jiff_instance) {
+  var avgs = jiff_instance.share(null, computes.length, computes, inputs);
+  var xAvg = avgs[inputs[0]];
+  var yAvg = avgs[inputs[1]];
+
+  var xBar = jiff_instance.share_array([], null, computes.length, computes, [inputs[0]]);
+  var yBar = jiff_instance.share_array([], null, computes.length, computes, [inputs[1]]);
+
+  var xBarSquare = jiff_instance.share(null, computes.length, computes, [inputs[0]])[inputs[0]];
+
+  Promise.all([xBar, yBar]).then(function (res) {
+    xBar = res[0][inputs[0]];
+    yBar = res[1][inputs[1]];
+
+    var numerator = xBar[0].smult(yBar[1], null, false);
+    for (var i = 1; i < xBar.length; i++) {
+      numerator = numerator.sadd(xBar[i].smult(yBar[i], null, false));
+    }
+
+    var denumerator = xBarSquare.cmult(jiff_instance.helpers.magnitude(decimal_digits));
+    fast_div(jiff_instance, numerator, denumerator).then(function (slope) {
+      var yIntercept = yAvg.ssub(slope.smult(xAvg, 'main-smult'));
+      jiff_instance.open(slope, [analyst]);
+      jiff_instance.open(yIntercept, [analyst]);
+    });
+  });
+};
diff --git a/presentation/linear-regression/compute/party.js b/presentation/linear-regression/compute/party.js
new file mode 100644
index 000000000..7c45aeae8
--- /dev/null
+++ b/presentation/linear-regression/compute/party.js
@@ -0,0 +1,17 @@
+/**
+ * Do not change this unless you have to.
+ * This code parses input command line arguments,
+ * and calls the appropriate initialization and MPC protocol from ./mpc.js
+ */
+var mpc = require('./mpc');
+var config = require('../config.json');
+
+// JIFF options
+var options = {
+  onConnect: mpc.compute,
+  initialization: {role: 'compute'},
+  party_count: config.total
+};
+
+// Connect
+mpc.connect('http://localhost:8080', config.computation_id, options);
diff --git a/presentation/linear-regression/config.json b/presentation/linear-regression/config.json
new file mode 100644
index 000000000..cf6e14706
--- /dev/null
+++ b/presentation/linear-regression/config.json
@@ -0,0 +1,5 @@
+{
+  "computation_id": "test",
+  "compute": 2,
+  "total": 5
+}
\ No newline at end of file
diff --git a/presentation/linear-regression/input/input.html b/presentation/linear-regression/input/input.html
new file mode 100644
index 000000000..7b47bc04e
--- /dev/null
+++ b/presentation/linear-regression/input/input.html
@@ -0,0 +1,59 @@
+<!-- Basic UI for running the demo in the browser -->
+
+<html>
+  <head>
+    <title>Sum integers under MPC</title>
+    <style>
+      .error {
+        color: #FF0000;
+      }
+
+      td, th {
+        border: solid 1px darkgray;
+      }
+
+      th input, td input {
+        width: 70px;
+      }
+
+      .party4 {
+        background-color: #3e999f;
+      }
+      .party5 {
+        background-color: #a5871f;
+      }
+    </style>
+    <script src="https://code.jquery.com/jquery-1.11.1.js"></script>
+    <script src="/socket.io/socket.io.js"></script>
+    <script src="/bignumber.js/bignumber.min.js"></script>
+    <script src="/lib/sodium.js"></script>
+    <script src="/lib/jiff-client.js"></script>
+    <script src="/lib/ext/jiff-client-bignumber.js"></script>
+    <script src="/lib/ext/jiff-client-fixedpoint.js"></script>
+    <script src="/lib/ext/jiff-client-negativenumber.js"></script>
+
+    <!-- Contains UI Handlers and Input Checks -->
+    <script type="text/javascript" src="/static/input/input.js"></script>
+
+    <!-- Contains the MPC implementation -->
+    <script type="text/javascript" src="/static/input/mpc.js"></script>
+  </head>
+  <body class="party{{id}}">
+    <h1>Input party {{ id - config.compute - 1}}</h1>
+    <h3>Linear Regression</h3>
+
+    <label for="points">Enter the number of points</label> <input id="points" pattern="[0-9]+"> <br/>
+    <button id="generate" onclick="generateTable(document.getElementById('points').value, {{id}})">Input</button>
+    <br/><br/>
+
+    <div id="input_area">
+
+    </div>
+    <button onclick="submit();" disabled="disabled" id="submit">Submit</button><br/>
+    <div id="output"></div>
+  </body>
+
+  <script type="text/javascript">
+    connect({{id}}, {{config.total}}, {{config.compute}}, '{{ config.computation_id }}');
+  </script>
+</html>
diff --git a/presentation/linear-regression/input/input.js b/presentation/linear-regression/input/input.js
new file mode 100644
index 000000000..75de0def0
--- /dev/null
+++ b/presentation/linear-regression/input/input.js
@@ -0,0 +1,103 @@
+/**
+ * Do not modify this file unless you have to.
+ * This file has UI handlers.
+ */
+
+// eslint-disable-next-line no-unused-vars
+var computes = [];
+function connect(party_id, party_count, compute_count, computation_id) {
+  def = defaults[party_id];
+
+  // Compute parties ids
+  for (var c = 1; c <= compute_count; c++) {
+    computes.push(c);
+  }
+
+  // jiff options
+  var options = { party_count: party_count, party_id: party_id };
+  options.onError = function (error) {
+    $('#output').append('<p class=\'error\'>'+error+'</p>');
+  };
+
+  // host name
+  var hostname = window.location.hostname.trim();
+  var port = window.location.port;
+  if (port == null || port === '') {
+    port = '80';
+  }
+  if (!(hostname.startsWith('http://') || hostname.startsWith('https://'))) {
+    hostname = 'http://' + hostname;
+  }
+  if (hostname.endsWith('/')) {
+    hostname = hostname.substring(0, hostname.length-1);
+  }
+  if (hostname.indexOf(':') > -1 && hostname.lastIndexOf(':') > hostname.indexOf(':')) {
+    hostname = hostname.substring(0, hostname.lastIndexOf(':'));
+  }
+
+  hostname = hostname + ':' + port;
+
+  // eslint-disable-next-line no-undef
+  var jiff_instance = mpc.connect(hostname, computation_id, options, computes);
+
+  // Display connection
+  jiff_instance.wait_for(computes, function () {
+    $('#output').append('<p>Connected!</p>');
+  });
+}
+
+// eslint-disable-next-line no-unused-vars
+function submit() {
+  $('#output').append('<p>Starting...</p>');
+  $('#submit').attr('disabled', true);
+
+  var parsed = parseInput();
+  // eslint-disable-next-line no-undef
+  mpc.compute(parsed);
+
+  $('#output').append('<p>Shared data successfully!</p>');
+}
+
+/**
+ * Helpers for HTML data generation and parsing
+ */
+function generateTable(points, id) {
+  $('#generate').attr('disabled', true);
+  $('#submit').attr('disabled', false);
+
+  var table = '<br/><table id="input_table">';
+  // Header
+  table += '<tr>';
+  table += '<th><input type="text" value="' + (id === 4 ? 'X' : 'Y') +'"></th>';
+  table += '</tr>';
+
+  // Generate Body
+  for (var j = 0; j < points; j++) {
+    table += '<tr>';
+    var input = '<input type="text" value="'+def[j]+'">';
+    table += '<td>' + input + '</td>';
+    table += '</tr>';
+  }
+
+  table += '</table>';
+  $('#input_area').html(table);
+}
+function parseInput() {
+  var data = [];
+
+  var table = document.getElementById('input_table');
+
+  // body
+  for (var i = 1; i < table.rows.length; i++) {
+    var row = table.rows[i];
+    data.push(parseInt(row.getElementsByTagName('input')[0].value));
+  }
+
+  return data;
+}
+
+var defaults = {
+  4: [ 1, 2, 3 ],
+  5: [ 2, 4, 6 ]
+};
+var def;
\ No newline at end of file
diff --git a/presentation/linear-regression/input/mpc.js b/presentation/linear-regression/input/mpc.js
new file mode 100644
index 000000000..2a4850bc5
--- /dev/null
+++ b/presentation/linear-regression/input/mpc.js
@@ -0,0 +1,55 @@
+(function (exports) {
+  var jiff_instance;
+  var computes;
+
+  /**
+   * Connect to the server and initialize the jiff instance
+   */
+  exports.connect = function (hostname, computation_id, options, _computes) {
+    computes = _computes;
+    var opt = Object.assign({}, options);
+    opt.Zp = '33554393';
+    opt.integer_digits = 3;
+    opt.decimal_digits = 2;
+
+    // eslint-disable-next-line no-undef
+    jiff_instance = jiff.make_jiff(hostname, computation_id, opt);
+    // eslint-disable-next-line no-undef
+    jiff_instance.apply_extension(jiff_bignumber, opt);
+    // eslint-disable-next-line no-undef
+    jiff_instance.apply_extension(jiff_fixedpoint, opt);
+    // eslint-disable-next-line no-undef
+    jiff_instance.apply_extension(jiff_negativenumber, opt);
+    return jiff_instance;
+  };
+
+  /**
+   * The MPC computation
+   */
+  exports.compute = function (data) {
+    console.log(data);
+    var avg = 0;
+    for (var i = 0; i < data.length; i++) {
+      avg += data[i];
+    }
+    avg = Math.floor(avg / data.length);
+
+    // Secret share average
+    console.log(avg);
+    jiff_instance.share(avg, computes.length, computes, [computes.length + 2, computes.length + 3]);
+
+    var bar = [];
+    var squared = 0;
+    for (var j = 0; j < data.length; j++) {
+      bar[j] = data[j] - avg;
+      squared += bar[j] * bar[j];
+    }
+
+    // Secret share array of (avg - diff)
+    console.log(computes, bar);
+    jiff_instance.share_array(bar, null, computes.length, computes, [ jiff_instance.id ]);
+
+    // Secret share sum of difference square (denumerator), only used for x.
+    jiff_instance.share(squared, computes.length, computes, [ jiff_instance.id ]);
+  };
+}(this.mpc = {}));
diff --git a/presentation/linear-regression/server.js b/presentation/linear-regression/server.js
new file mode 100644
index 000000000..9d0704bcd
--- /dev/null
+++ b/presentation/linear-regression/server.js
@@ -0,0 +1,65 @@
+var express = require('express');
+var app = express();
+
+var http = require('http').Server(app);
+http.listen(8080, function () {
+  console.log('listening on *:8080');
+});
+
+// nunjucks for rendering html template
+var nunjucks = require('nunjucks');
+nunjucks.configure(__dirname, {
+  autoescape: true,
+  express: app
+});
+
+// read configurations
+var config = require('./config.json');
+
+//Serve static files
+app.use('/bignumber.js', express.static(__dirname + '/../../node_modules/bignumber.js'));
+app.use('/lib', express.static(__dirname + '/../../lib'));
+
+// Server input and analyst files
+app.use('/static/input', express.static(__dirname + '/input'));
+app.use('/static/analyst', express.static(__dirname + '/analyst'));
+app.get('/input/:id', function (req, res) {
+  var party_id = parseInt(req.params.id, 10);
+  res.render('input/input.html', {id: party_id + config.compute + 1, config: config});
+});
+app.get('/analyst', function (req, res) {
+  res.render('analyst/analyst.html', {id: config.compute + 1, config: config});
+});
+
+// Manage roles / IDS
+// Keep track of assigned ids
+var assignedCompute = 1;
+var initialize = function (jiff, computation_id, msg, params) {
+  if (params.party_id != null) {
+    return params;
+  }
+
+  if (msg.role === 'input') {
+    return params;
+  }
+  if (msg.role === 'analyst') {
+    params['party_id'] = config.compute + 1;
+    return params;
+  }
+  if (msg.role === 'compute' && assignedCompute <= config.compute) {
+    params['party_id'] = assignedCompute;
+    assignedCompute++;
+    return params;
+  }
+
+  throw new Error('Unrecognized role and party id options');
+};
+
+require('../../lib/jiff-server').make_jiff(http, {logs: true, hooks: { beforeInitialization: [initialize] }});
+
+
+// Instructions
+console.log('Direct your browser to http://localhost/input/<party-id> for inputing data');
+console.log('Direct your browser to http://localhost/analyst for analyst UI');
+console.log('Run compute parties with node compute/party.js');
+console.log();
\ No newline at end of file

From e1659b03c1ca75783f7cb8f20e05a8ae8c95b00b Mon Sep 17 00:00:00 2001
From: Kinan Dak Al Bab <kinan.bab.14@gmail.com>
Date: Wed, 13 Feb 2019 01:19:22 -0500
Subject: [PATCH 9/9] Finalized two demos

---
 .../analyst/analyst.html                      |  14 +-
 .../analyst/analyst.js                        |  17 ++-
 .../analyst/mpc.js                            |   6 +-
 .../compute/mpc.js                            |  65 +++++----
 .../compute/party.js                          |   1 -
 .../config.json                               |   0
 .../input/input.html                          |  31 ++++-
 .../input/input.js                            |  12 +-
 .../input/mpc.js                              |  18 ++-
 .../server.js                                 |   3 +-
 .../analyst/analyst.html                      |  14 +-
 .../analyst/analyst.js                        |   0
 .../analyst/mpc.js                            |  15 +-
 .../compute/join.js                           |   0
 .../compute/mpc.js                            |  43 ++++--
 .../compute/party.js                          |   4 +-
 .../config.json                               |   0
 presentation/relational/input/input.html      | 128 ++++++++++++++++++
 .../input/input.js                            |  38 ++++--
 .../input/mpc.js                              |  32 +++++
 .../server.js                                 |   3 +-
 .../table-join-filter-count/input/input.html  |  63 ---------
 22 files changed, 345 insertions(+), 162 deletions(-)
 rename presentation/{linear-regression => least-squares}/analyst/analyst.html (78%)
 rename presentation/{linear-regression => least-squares}/analyst/analyst.js (87%)
 rename presentation/{linear-regression => least-squares}/analyst/mpc.js (92%)
 rename presentation/{linear-regression => least-squares}/compute/mpc.js (58%)
 rename presentation/{table-join-filter-count => least-squares}/compute/party.js (94%)
 rename presentation/{linear-regression => least-squares}/config.json (100%)
 rename presentation/{linear-regression => least-squares}/input/input.html (77%)
 rename presentation/{linear-regression => least-squares}/input/input.js (90%)
 rename presentation/{linear-regression => least-squares}/input/mpc.js (81%)
 rename presentation/{table-join-filter-count => least-squares}/server.js (89%)
 rename presentation/{table-join-filter-count => relational}/analyst/analyst.html (74%)
 rename presentation/{table-join-filter-count => relational}/analyst/analyst.js (100%)
 rename presentation/{table-join-filter-count => relational}/analyst/mpc.js (80%)
 rename presentation/{table-join-filter-count => relational}/compute/join.js (100%)
 rename presentation/{table-join-filter-count => relational}/compute/mpc.js (81%)
 rename presentation/{linear-regression => relational}/compute/party.js (88%)
 rename presentation/{table-join-filter-count => relational}/config.json (100%)
 create mode 100644 presentation/relational/input/input.html
 rename presentation/{table-join-filter-count => relational}/input/input.js (74%)
 rename presentation/{table-join-filter-count => relational}/input/mpc.js (53%)
 rename presentation/{linear-regression => relational}/server.js (89%)
 delete mode 100644 presentation/table-join-filter-count/input/input.html

diff --git a/presentation/linear-regression/analyst/analyst.html b/presentation/least-squares/analyst/analyst.html
similarity index 78%
rename from presentation/linear-regression/analyst/analyst.html
rename to presentation/least-squares/analyst/analyst.html
index b4a62bd01..d25e4becc 100644
--- a/presentation/linear-regression/analyst/analyst.html
+++ b/presentation/least-squares/analyst/analyst.html
@@ -2,7 +2,7 @@
 
 <html>
   <head>
-    <title>Sum integers under MPC</title>
+    <title>Linear Least Squares</title>
     <style>
       .error {
         color: #FF0000;
@@ -36,18 +36,12 @@
   </head>
   <body>
     <h1>Analyst</h1>
-    <h3>Input Parties Schemas:</h3>
-    <div id="schema"></div>
-
-    <h3>Analysis:</h3>
-    <textarea rows="8" cols="75" placeholder="Enter your query"></textarea>
-    <br/>
-    <button onclick="submit();" id="submit">Query</button>
+    <h3>Analysis:</h3> <button onclick="submit();" id="submit">Linear Least Squares</button>
     <br/>
     <h3>Output:</h3>
     <div id="output" style="display: none;">
-      <div style="width:300px; height:300px;">
-        <canvas id="myChart" width="400" height="400"></canvas>
+      <div style="width:900px; height:900px;">
+        <canvas id="myChart" width="900" height="900"></canvas>
       </div>
     </div>
   </body>
diff --git a/presentation/linear-regression/analyst/analyst.js b/presentation/least-squares/analyst/analyst.js
similarity index 87%
rename from presentation/linear-regression/analyst/analyst.js
rename to presentation/least-squares/analyst/analyst.js
index be97239c1..a488d6d5d 100644
--- a/presentation/linear-regression/analyst/analyst.js
+++ b/presentation/least-squares/analyst/analyst.js
@@ -58,10 +58,10 @@ function submit() {
  * Helpers for drawing lines in a chart
  */
 // The limits of the graph. The minimum and maximum X and Y values.
-var minX = -5;
-var maxX = 5;
-var minY = -5;
-var maxY = 5;
+var minX = -60;
+var maxX = 60;
+var minY = -60;
+var maxY = 60;
 
 // Chart for drawing
 function initChart(line) {
@@ -77,7 +77,7 @@ function initChart(line) {
     type: 'line',
     data: {
       datasets: [
-        { id: 'least-line', label: 'output', data: line, fill: false, pointBackgroundColor: '#000099', borderColor: '#000099', pointRadius: 0 }
+        { id: 'least-line', label: '', data: line, fill: false, pointBackgroundColor: '#000099', borderColor: '#000099', pointRadius: 0 }
       ]
     },
     options: {
@@ -89,14 +89,13 @@ function initChart(line) {
 }
 
 function plot(data) {
-  console.log(data);
+  console.log(data.slope.toString(), data.yIntercept.toString());
   var m = data.slope;
   var p = data.yIntercept;
 
   var points = [];
-  for (var i = minX; i <= maxX; i++) {
-    var y = m.times(i).plus(p).toNumber();
-    points.push({x: i, y: y});
+  for (var i = minX; i <= maxX; i+=1) {
+    points.push({x: i, y: m.times(i).plus(p).toNumber()});
   }
 
   $('#output').show();
diff --git a/presentation/linear-regression/analyst/mpc.js b/presentation/least-squares/analyst/mpc.js
similarity index 92%
rename from presentation/linear-regression/analyst/mpc.js
rename to presentation/least-squares/analyst/mpc.js
index fd0e2b049..8b8825d00 100644
--- a/presentation/linear-regression/analyst/mpc.js
+++ b/presentation/least-squares/analyst/mpc.js
@@ -8,9 +8,9 @@
   exports.connect = function (hostname, computation_id, options, _computes, schema_callback) {
     computes = _computes;
     var opt = Object.assign({}, options);
-    opt.Zp = '33554393';
-    opt.integer_digits = 3;
-    opt.decimal_digits = 2;
+    opt.Zp = '4503599627370449';
+    opt.integer_digits = 9;
+    opt.decimal_digits = 3;
 
     // eslint-disable-next-line no-undef
     jiff_instance = jiff.make_jiff(hostname, computation_id, opt);
diff --git a/presentation/linear-regression/compute/mpc.js b/presentation/least-squares/compute/mpc.js
similarity index 58%
rename from presentation/linear-regression/compute/mpc.js
rename to presentation/least-squares/compute/mpc.js
index 2024ec364..a918ef813 100644
--- a/presentation/linear-regression/compute/mpc.js
+++ b/presentation/least-squares/compute/mpc.js
@@ -1,5 +1,5 @@
 // Configurations
-var decimal_digits = 2;
+var decimal_digits = 3;
 
 var config = require('../config.json');
 var computes = [];
@@ -12,28 +12,13 @@ for (var i = config.compute + 2; i <= config.total; i++) {
   inputs.push(i);
 }
 
-function fast_div(jiff_instance, x, y) {
-  return new Promise(function (resolve) {
-    jiff_instance.open(y, computes, 'main-open').then(function (y) {
-      var res = x.cdiv(200, 'main-cdiv');
-      resolve(res);
-    });
-  });
-  /*
-  return jiff_instance.open(y).then(function (y) {
-    console.log(y.toString());
-    return x.cdiv(y);
-  });
-  */
-}
-
 /**
  * Connect to the server and initialize the jiff instance
  */
 exports.connect = function (hostname, computation_id, options) {
   var opt = Object.assign({}, options);
-  opt.Zp = '33554393';
-  opt.integer_digits = 3;
+  opt.Zp = '4503599627370449';
+  opt.integer_digits = 9;
   opt.decimal_digits = decimal_digits;
 
   var jiff = require('../../../lib/jiff-client');
@@ -45,18 +30,46 @@ exports.connect = function (hostname, computation_id, options) {
   jiff_instance.apply_extension(jiff_bignumber, opt);
   jiff_instance.apply_extension(jiff_fixedpoint, opt);
   jiff_instance.apply_extension(jiff_negativenumber, opt);
+  jiff_instance.wait_for(computes, function () {
+    compute(jiff_instance);
+  });
+  jiff_instance.wait_for(['s1'], function () {
+    console.log('This is compute party ', jiff_instance.id);
+  })
 };
 
 /**
  * The MPC computation
  */
-exports.compute = function (jiff_instance) {
+function compute(jiff_instance) {
   var avgs = jiff_instance.share(null, computes.length, computes, inputs);
   var xAvg = avgs[inputs[0]];
   var yAvg = avgs[inputs[1]];
 
   var xBar = jiff_instance.share_array([], null, computes.length, computes, [inputs[0]]);
   var yBar = jiff_instance.share_array([], null, computes.length, computes, [inputs[1]]);
+  xBar.then(function (arr) {
+    console.log('First input party secret shared their data!');
+    var share = arr[inputs[0]][0];
+    if (share.value != null) {
+      console.log('First secret share value ', share.value.toString());
+    } else {
+      share.promise.then(function () {
+        console.log('First secret share value ', share.value.toString());
+      });
+    }
+  });
+  yBar.then(function (arr) {
+    console.log('Second input party secret shared their data!');
+    var share = arr[inputs[1]][0];
+    if (share.value != null) {
+      console.log('First secret share value ', share.value.toString());
+    } else {
+      share.promise.then(function () {
+        console.log('First secret share value ', share.value.toString());
+      });
+    }
+  });
 
   var xBarSquare = jiff_instance.share(null, computes.length, computes, [inputs[0]])[inputs[0]];
 
@@ -64,16 +77,20 @@ exports.compute = function (jiff_instance) {
     xBar = res[0][inputs[0]];
     yBar = res[1][inputs[1]];
 
-    var numerator = xBar[0].smult(yBar[1], null, false);
+    var numerator = xBar[0].smult(yBar[0], null, false);
     for (var i = 1; i < xBar.length; i++) {
       numerator = numerator.sadd(xBar[i].smult(yBar[i], null, false));
     }
-
     var denumerator = xBarSquare.cmult(jiff_instance.helpers.magnitude(decimal_digits));
-    fast_div(jiff_instance, numerator, denumerator).then(function (slope) {
-      var yIntercept = yAvg.ssub(slope.smult(xAvg, 'main-smult'));
+
+    // Compute slope and y Intercept of line
+    var slope = numerator.sdiv(denumerator);
+    var yIntercept = yAvg.ssub(slope.smult(xAvg, 'main-smult'));
+
+    // Done
+    jiff_instance.wait_for([analyst], function () {
       jiff_instance.open(slope, [analyst]);
       jiff_instance.open(yIntercept, [analyst]);
     });
   });
-};
+}
diff --git a/presentation/table-join-filter-count/compute/party.js b/presentation/least-squares/compute/party.js
similarity index 94%
rename from presentation/table-join-filter-count/compute/party.js
rename to presentation/least-squares/compute/party.js
index 7c45aeae8..cf3466b4d 100644
--- a/presentation/table-join-filter-count/compute/party.js
+++ b/presentation/least-squares/compute/party.js
@@ -8,7 +8,6 @@ var config = require('../config.json');
 
 // JIFF options
 var options = {
-  onConnect: mpc.compute,
   initialization: {role: 'compute'},
   party_count: config.total
 };
diff --git a/presentation/linear-regression/config.json b/presentation/least-squares/config.json
similarity index 100%
rename from presentation/linear-regression/config.json
rename to presentation/least-squares/config.json
diff --git a/presentation/linear-regression/input/input.html b/presentation/least-squares/input/input.html
similarity index 77%
rename from presentation/linear-regression/input/input.html
rename to presentation/least-squares/input/input.html
index 7b47bc04e..5381de14a 100644
--- a/presentation/linear-regression/input/input.html
+++ b/presentation/least-squares/input/input.html
@@ -2,25 +2,44 @@
 
 <html>
   <head>
-    <title>Sum integers under MPC</title>
+    <title>Linear Least Squares</title>
     <style>
       .error {
         color: #FF0000;
       }
 
-      td, th {
-        border: solid 1px darkgray;
+      table {
+        margin-left: -4px;
+      }
+
+      .party4 th {
+        border: dashed 4px darkgray;
+      }
+
+      .party5 th {
+        border: dashed 4px #222222;
+      }
+
+      td {
+        padding: 4px;
       }
 
       th input, td input {
         width: 70px;
       }
 
+      .break {
+        border: none;
+        height: 5px;
+      }
+
       .party4 {
-        background-color: #3e999f;
+        background-color: #1e499f;
+        color: #FFFFFF;
       }
       .party5 {
-        background-color: #a5871f;
+        background-color: #bec4bc;
+        color: #000000;
       }
     </style>
     <script src="https://code.jquery.com/jquery-1.11.1.js"></script>
@@ -40,7 +59,7 @@
   </head>
   <body class="party{{id}}">
     <h1>Input party {{ id - config.compute - 1}}</h1>
-    <h3>Linear Regression</h3>
+    <h3>Linear Least Squares</h3>
 
     <label for="points">Enter the number of points</label> <input id="points" pattern="[0-9]+"> <br/>
     <button id="generate" onclick="generateTable(document.getElementById('points').value, {{id}})">Input</button>
diff --git a/presentation/linear-regression/input/input.js b/presentation/least-squares/input/input.js
similarity index 90%
rename from presentation/linear-regression/input/input.js
rename to presentation/least-squares/input/input.js
index 75de0def0..5a88e1a4d 100644
--- a/presentation/linear-regression/input/input.js
+++ b/presentation/least-squares/input/input.js
@@ -69,7 +69,7 @@ function generateTable(points, id) {
   // Header
   table += '<tr>';
   table += '<th><input type="text" value="' + (id === 4 ? 'X' : 'Y') +'"></th>';
-  table += '</tr>';
+  table += '</tr><tr><td class="break"></td></tr>';
 
   // Generate Body
   for (var j = 0; j < points; j++) {
@@ -79,7 +79,7 @@ function generateTable(points, id) {
     table += '</tr>';
   }
 
-  table += '</table>';
+  table += '</table><br/><br/>';
   $('#input_area').html(table);
 }
 function parseInput() {
@@ -88,16 +88,16 @@ function parseInput() {
   var table = document.getElementById('input_table');
 
   // body
-  for (var i = 1; i < table.rows.length; i++) {
+  for (var i = 2; i < table.rows.length; i++) {
     var row = table.rows[i];
-    data.push(parseInt(row.getElementsByTagName('input')[0].value));
+    data.push(Number(row.getElementsByTagName('input')[0].value));
   }
 
   return data;
 }
 
 var defaults = {
-  4: [ 1, 2, 3 ],
-  5: [ 2, 4, 6 ]
+  4: [ 1, 10, -5.3, -30.3 ],
+  5: [ 2, 22.1, -9.813, -45.2 ]
 };
 var def;
\ No newline at end of file
diff --git a/presentation/linear-regression/input/mpc.js b/presentation/least-squares/input/mpc.js
similarity index 81%
rename from presentation/linear-regression/input/mpc.js
rename to presentation/least-squares/input/mpc.js
index 2a4850bc5..f5e0f4847 100644
--- a/presentation/linear-regression/input/mpc.js
+++ b/presentation/least-squares/input/mpc.js
@@ -1,3 +1,4 @@
+/* global BigNumber */
 (function (exports) {
   var jiff_instance;
   var computes;
@@ -8,9 +9,9 @@
   exports.connect = function (hostname, computation_id, options, _computes) {
     computes = _computes;
     var opt = Object.assign({}, options);
-    opt.Zp = '33554393';
-    opt.integer_digits = 3;
-    opt.decimal_digits = 2;
+    opt.Zp = '4503599627370449';
+    opt.integer_digits = 9;
+    opt.decimal_digits = 3;
 
     // eslint-disable-next-line no-undef
     jiff_instance = jiff.make_jiff(hostname, computation_id, opt);
@@ -27,26 +28,23 @@
    * The MPC computation
    */
   exports.compute = function (data) {
-    console.log(data);
     var avg = 0;
     for (var i = 0; i < data.length; i++) {
       avg += data[i];
     }
-    avg = Math.floor(avg / data.length);
+    avg = new BigNumber(avg.toString()).div(data.length);
 
     // Secret share average
-    console.log(avg);
     jiff_instance.share(avg, computes.length, computes, [computes.length + 2, computes.length + 3]);
 
     var bar = [];
-    var squared = 0;
+    var squared = new BigNumber(0);
     for (var j = 0; j < data.length; j++) {
-      bar[j] = data[j] - avg;
-      squared += bar[j] * bar[j];
+      bar[j] = new BigNumber(data[j].toString()).minus(avg);
+      squared = squared.plus(bar[j].times(bar[j]));
     }
 
     // Secret share array of (avg - diff)
-    console.log(computes, bar);
     jiff_instance.share_array(bar, null, computes.length, computes, [ jiff_instance.id ]);
 
     // Secret share sum of difference square (denumerator), only used for x.
diff --git a/presentation/table-join-filter-count/server.js b/presentation/least-squares/server.js
similarity index 89%
rename from presentation/table-join-filter-count/server.js
rename to presentation/least-squares/server.js
index 9d0704bcd..78360f2b6 100644
--- a/presentation/table-join-filter-count/server.js
+++ b/presentation/least-squares/server.js
@@ -55,7 +55,8 @@ var initialize = function (jiff, computation_id, msg, params) {
   throw new Error('Unrecognized role and party id options');
 };
 
-require('../../lib/jiff-server').make_jiff(http, {logs: true, hooks: { beforeInitialization: [initialize] }});
+var jiff_instance = require('../../lib/jiff-server.js').make_jiff(http, {logs: true, hooks: { beforeInitialization: [initialize] }});
+jiff_instance.apply_extension(require('../../lib/ext/jiff-server-bignumber.js'));
 
 
 // Instructions
diff --git a/presentation/table-join-filter-count/analyst/analyst.html b/presentation/relational/analyst/analyst.html
similarity index 74%
rename from presentation/table-join-filter-count/analyst/analyst.html
rename to presentation/relational/analyst/analyst.html
index 65139bfa4..0c29568c9 100644
--- a/presentation/table-join-filter-count/analyst/analyst.html
+++ b/presentation/relational/analyst/analyst.html
@@ -2,7 +2,7 @@
 
 <html>
   <head>
-    <title>Sum integers under MPC</title>
+    <title>Relational MPC Workflow</title>
     <style>
       .error {
         color: #FF0000;
@@ -18,8 +18,11 @@
     </style>
     <script src="https://code.jquery.com/jquery-1.11.1.js"></script>
     <script src="/socket.io/socket.io.js"></script>
+    <script src="/bignumber.js/bignumber.min.js"></script>
     <script src="/lib/sodium.js"></script>
     <script src="/lib/jiff-client.js"></script>
+    <script src="/lib/ext/jiff-client-bignumber.js"></script>
+    <script src="/lib/ext/jiff-client-fixedpoint.js"></script>
 
     <!-- Contains UI Handlers and Input Checks -->
     <script type="text/javascript" src="/static/analyst/analyst.js"></script>
@@ -33,7 +36,14 @@ <h3>Input Parties Schemas:</h3>
     <div id="schema"></div>
 
     <h3>Analysis:</h3>
-    <textarea rows="8" cols="75" placeholder="Enter your query"></textarea>
+    <textarea rows="9" cols="75">SELECT
+  4.GROUP, AVG(1:2.VALUE)
+FROM
+  1:2 join 3 on ID join 4 on ID
+WHERE
+  3.FILTER = True
+GROUP BY
+  4.GROUP</textarea>
     <br/>
     <button onclick="submit();" id="submit">Query</button>
     <br/>
diff --git a/presentation/table-join-filter-count/analyst/analyst.js b/presentation/relational/analyst/analyst.js
similarity index 100%
rename from presentation/table-join-filter-count/analyst/analyst.js
rename to presentation/relational/analyst/analyst.js
diff --git a/presentation/table-join-filter-count/analyst/mpc.js b/presentation/relational/analyst/mpc.js
similarity index 80%
rename from presentation/table-join-filter-count/analyst/mpc.js
rename to presentation/relational/analyst/mpc.js
index a69834264..71c24e2c4 100644
--- a/presentation/table-join-filter-count/analyst/mpc.js
+++ b/presentation/relational/analyst/mpc.js
@@ -1,4 +1,4 @@
-var GROUP_BY_DOMAIN = [1, 2, 3];
+var GROUP_BY_DOMAIN = ['Group A', 'Group B', 'Group C'];
 
 (function (exports) {
   var jiff_instance;
@@ -12,8 +12,17 @@ var GROUP_BY_DOMAIN = [1, 2, 3];
     computes = _computes;
     var opt = Object.assign({}, options);
 
+    opt.Zp = '16381';
+    opt.integer_digits = 2;
+    opt.decimal_digits = 2;
+
     // eslint-disable-next-line no-undef
     jiff_instance = jiff.make_jiff(hostname, computation_id, opt);
+    // eslint-disable-next-line no-undef
+    jiff_instance.apply_extension(jiff_bignumber, opt);
+    // eslint-disable-next-line no-undef
+    jiff_instance.apply_extension(jiff_fixedpoint, opt);
+
     jiff_instance.listen('headers', function (id, cols) {
       cols = JSON.parse(cols);
       schemas[id] = cols;
@@ -27,9 +36,7 @@ var GROUP_BY_DOMAIN = [1, 2, 3];
   /**
    * The MPC computation
    */
-  exports.compute = function (cols, data) {
-    jiff_instance.emit('compute', computes, '', false);
-
+  exports.compute = function () {
     var inputs = [];
     for (var i = computes.length + 2; i <= jiff_instance.party_count; i++) {
       inputs.push(i);
diff --git a/presentation/table-join-filter-count/compute/join.js b/presentation/relational/compute/join.js
similarity index 100%
rename from presentation/table-join-filter-count/compute/join.js
rename to presentation/relational/compute/join.js
diff --git a/presentation/table-join-filter-count/compute/mpc.js b/presentation/relational/compute/mpc.js
similarity index 81%
rename from presentation/table-join-filter-count/compute/mpc.js
rename to presentation/relational/compute/mpc.js
index ea3892b1b..dae47ad6d 100644
--- a/presentation/table-join-filter-count/compute/mpc.js
+++ b/presentation/relational/compute/mpc.js
@@ -15,19 +15,42 @@ for (var i = config.compute + 2; i <= config.total; i++) {
 
 // Schemas
 var schemas = {};
+var total = 0;
 
 /**
  * Connect to the server and initialize the jiff instance
  */
 exports.connect = function (hostname, computation_id, options) {
   var opt = Object.assign({}, options);
+
+  // eslint-disable-next-line no-undef
+  opt.Zp = '16381';
+  opt.integer_digits = 2;
+  opt.decimal_digits = 2;
+
   var jiff = require('../../../lib/jiff-client');
+  var jiff_bignumber = require('../../../lib/ext/jiff-client-bignumber');
+  var jiff_fixedpoint = require('../../../lib/ext/jiff-client-fixedpoint');
 
   // eslint-disable-next-line no-undef
   var jiff_instance = jiff.make_jiff(hostname, computation_id, opt);
+  // eslint-disable-next-line no-undef
+  jiff_instance.apply_extension(jiff_bignumber, opt);
+  // eslint-disable-next-line no-undef
+  jiff_instance.apply_extension(jiff_fixedpoint, opt);
+
   jiff_instance.listen('headers', function (id, cols) {
     cols = JSON.parse(cols);
     schemas[id] = cols;
+
+    total++;
+    if (total === inputs.length) {
+      compute(jiff_instance);
+    }
+  });
+
+  jiff_instance.wait_for(['s1'], function () {
+    console.log('This is compute party ', jiff_instance.id);
   });
 };
 
@@ -52,7 +75,7 @@ function transform(table) {
 /**
  * The MPC computation
  */
-exports.compute = function (jiff_instance) {
+function compute(jiff_instance) {
   var join = require('./join.js');
 
   // ids
@@ -168,14 +191,14 @@ exports.compute = function (jiff_instance) {
 
     return { avg: avg_col, count: count_col };
   }).then(function (results) {
-    var output_schema = ['avg', 'count'];
-    // All is done, open the result.
-    for (var gi = 0; gi < GROUP_BY_DOMAIN.length; gi++) {
-      for (var si = 0; si < output_schema.length; si++) {
-        jiff_instance.open(results[output_schema[si]][gi], [analyst]);
+    jiff_instance.wait_for([analyst], function () {
+      var output_schema = ['avg', 'count'];
+      // All is done, open the result.
+      for (var gi = 0; gi < GROUP_BY_DOMAIN.length; gi++) {
+        for (var si = 0; si < output_schema.length; si++) {
+          jiff_instance.open(results[output_schema[si]][gi], [analyst]);
+        }
       }
-    }
-  }).catch(function (err) {
-    console.log(err);
+    });
   });
-};
+}
diff --git a/presentation/linear-regression/compute/party.js b/presentation/relational/compute/party.js
similarity index 88%
rename from presentation/linear-regression/compute/party.js
rename to presentation/relational/compute/party.js
index 7c45aeae8..37930f969 100644
--- a/presentation/linear-regression/compute/party.js
+++ b/presentation/relational/compute/party.js
@@ -8,9 +8,9 @@ var config = require('../config.json');
 
 // JIFF options
 var options = {
-  onConnect: mpc.compute,
   initialization: {role: 'compute'},
-  party_count: config.total
+  party_count: config.total,
+  warn: false
 };
 
 // Connect
diff --git a/presentation/table-join-filter-count/config.json b/presentation/relational/config.json
similarity index 100%
rename from presentation/table-join-filter-count/config.json
rename to presentation/relational/config.json
diff --git a/presentation/relational/input/input.html b/presentation/relational/input/input.html
new file mode 100644
index 000000000..3159e3f70
--- /dev/null
+++ b/presentation/relational/input/input.html
@@ -0,0 +1,128 @@
+<!-- Basic UI for running the demo in the browser -->
+
+<html>
+  <head>
+    <title>Relational MPC Workflow</title>
+    <style>
+      .error {
+        color: #FF0000;
+      }
+
+      table {
+        margin-left: -4px;
+      }
+
+      .party5 tr th {
+        border-top: dashed 4px #FFFFFF;
+        border-bottom: dashed 4px #FFFFFF;
+      }
+
+      .party6 tr th {
+        border-top: dashed 4px #FFFFFF;
+        border-bottom: dashed 4px #FFFFFF;
+      }
+
+      .party7 tr th {
+        border-top: dashed 4px #000000;
+        border-bottom: dashed 4px #000000;
+      }
+
+      .party8 tr th {
+        border-top: dashed 4px #FFFFFF;
+        border-bottom: dashed 4px #FFFFFF;
+      }
+
+
+      .party5 tr th:first-child {
+        border-left: dashed 4px #FFFFFF;
+      }
+      .party5 tr th:last-child {
+        border-right: dashed 4px #FFFFFF;
+      }
+
+      .party6 tr th:first-child {
+        border-left: dashed 4px #FFFFFF;
+      }
+      .party6 tr th:last-child {
+        border-right: dashed 4px #FFFFFF;
+      }
+
+      .party7 tr th:first-child {
+        border-left: dashed 4px #000000;
+      }
+      .party7 tr th:last-child {
+        border-right: dashed 4px #000000;
+      }
+
+      .party8 tr th:first-child {
+        border-left: dashed 4px #FFFFFF;
+      }
+      .party8 tr th:last-child {
+        border-right: dashed 4px #FFFFFF;
+      }
+
+      td {
+        padding: 4px;
+      }
+
+      th input, td input {
+        width: 70px;
+      }
+
+      .break {
+        border: none;
+        height: 5px;
+      }
+
+      .party5 {
+        background-color: #1e499f;
+        color: #FFFFFF;
+      }
+      .party6 {
+        background-color: #710B02;
+        color: #FFFFFF;
+      }
+      .party7 {
+        background-color: #bec4bc;
+        color: #000000;
+      }
+      .party8 {
+        background-color: darkolivegreen;
+        color: #FFFFFF;
+      }
+    </style>
+    <script src="https://code.jquery.com/jquery-1.11.1.js"></script>
+    <script src="/socket.io/socket.io.js"></script>
+    <script src="/bignumber.js/bignumber.min.js"></script>
+    <script src="/lib/sodium.js"></script>
+    <script src="/lib/jiff-client.js"></script>
+    <script src="/lib/ext/jiff-client-bignumber.js"></script>
+    <script src="/lib/ext/jiff-client-fixedpoint.js"></script>
+
+    <!-- Contains UI Handlers and Input Checks -->
+    <script type="text/javascript" src="/static/input/input.js"></script>
+
+    <!-- Contains the MPC implementation -->
+    <script type="text/javascript" src="/static/input/mpc.js"></script>
+  </head>
+  <body class="party{{id}}">
+    <h1>Input party {{ id - config.compute - 1}}</h1>
+    <h3>Join / Filter / Group / Average under MPC</h3>
+
+    <label for="cols">Enter the number of columns</label> <input id="cols" pattern="[0-9]+" value="2"> <br/>
+    <label for="rows">Enter the number of rows&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label> <input id="rows" pattern="[0-9]+"> <br/>
+    <button id="generate" onclick="generateTable(document.getElementById('cols').value, document.getElementById('rows').value)">Input</button>
+    <br/><br/>
+
+
+    <div id="input_area">
+
+    </div>
+    <button onclick="submit();" disabled="disabled" id="submit">Submit</button><br/>
+    <div id="output"></div>
+  </body>
+
+  <script type="text/javascript">
+    connect({{id}}, {{config.total}}, {{config.compute}}, '{{ config.computation_id }}');
+  </script>
+</html>
diff --git a/presentation/table-join-filter-count/input/input.js b/presentation/relational/input/input.js
similarity index 74%
rename from presentation/table-join-filter-count/input/input.js
rename to presentation/relational/input/input.js
index ff647ec3a..3beb4d97e 100644
--- a/presentation/table-join-filter-count/input/input.js
+++ b/presentation/relational/input/input.js
@@ -7,6 +7,8 @@
 var computes = [];
 function connect(party_id, party_count, compute_count, computation_id) {
   def = defaults[party_id];
+  hed = headers[party_id];
+  document.getElementById('rows').value = def.length / 2;
 
   // Compute parties ids
   for (var c = 1; c <= compute_count; c++) {
@@ -69,9 +71,9 @@ function generateTable(cols, rows) {
   // Header
   table += '<tr>';
   for (var i = 0; i < cols; i++) {
-    table += '<th><input type="text" value="'+i+'"></th>';
+    table += '<th><input type="text" value="'+hed[i]+'"></th>';
   }
-  table += '</tr>';
+  table += '</tr><tr><td colspan="10"></td></tr>';
 
   // Generate Body
   for (var j = 0; j < rows; j++) {
@@ -83,7 +85,7 @@ function generateTable(cols, rows) {
     table += '</tr>';
   }
 
-  table += '</table>';
+  table += '</table><br/><br/>';
   $('#input_area').html(table);
 }
 function parseInput() {
@@ -99,12 +101,12 @@ function parseInput() {
   }
 
   // body
-  for (var i = 1; i < table.rows.length; i++) {
+  for (var i = 2; i < table.rows.length; i++) {
     var row = table.rows[i];
     var obj = {};
     for (var j = 0; j < cols.length; j++) {
       var cell = row.cells[j];
-      obj[cols[j]] = parseInt(cell.getElementsByTagName('input')[0].value);
+      obj[cols[j]] = cell.getElementsByTagName('input')[0].value;
     }
     data.push(obj);
   }
@@ -112,10 +114,26 @@ function parseInput() {
   return { cols: cols, data: data};
 }
 
+/* var defaults = {
+  5: ['A', 10, 'B', 5, 'C', 2],
+  6: ['Z', 5],
+  7: ['A', 'True', 'B', 'True', 'Z', 'True'],
+  8: ['A', 'Group A', 'B', 'Group B', 'Z', 'Group C']
+}; */
+
 var defaults = {
-  5: [ 1, 10, 2, 20 ],
-  6: [ 3, 30 ],
-  7: [ 1, 1, 2, 2, 3, 1 ],
-  8: [ 1, 1, 2, 2, 3, 1 ]
+  5: [ 'Alice', 10.23, 'Lora', 20.30, 'Bob', 0.12 ],
+  6: [ 'Kinan', 30, 'Caroline', 5.99 ],
+  7: [ 'Alice', 'False', 'Kinan', 'True', 'John', 'True', 'Lora', 'True', 'Caroline', 'True' ],
+  8: [ 'Alice', 'Group A', 'John', 'Group A', 'Kinan', 'Group B', 'Caroline', 'Group B', 'Lora', 'Group C', 'Sam', 'Group B' ]
+};
+
+var headers = {
+  5: ['ID', 'VALUE'],
+  6: ['ID', 'VALUE'],
+  7: ['ID', 'FILTER'],
+  8: ['ID', 'GROUP']
 };
-var def;
\ No newline at end of file
+
+var def;
+var hed;
\ No newline at end of file
diff --git a/presentation/table-join-filter-count/input/mpc.js b/presentation/relational/input/mpc.js
similarity index 53%
rename from presentation/table-join-filter-count/input/mpc.js
rename to presentation/relational/input/mpc.js
index ad0b5a5e1..d815aec59 100644
--- a/presentation/table-join-filter-count/input/mpc.js
+++ b/presentation/relational/input/mpc.js
@@ -9,8 +9,17 @@
     computes = _computes;
     var opt = Object.assign({}, options);
 
+    opt.Zp = '16381';
+    opt.integer_digits = 2;
+    opt.decimal_digits = 2;
+
     // eslint-disable-next-line no-undef
     jiff_instance = jiff.make_jiff(hostname, computation_id, opt);
+    // eslint-disable-next-line no-undef
+    jiff_instance.apply_extension(jiff_bignumber, opt);
+    // eslint-disable-next-line no-undef
+    jiff_instance.apply_extension(jiff_fixedpoint, opt);
+
     return jiff_instance;
   };
 
@@ -23,6 +32,29 @@
       scoped_cols[i] = (jiff_instance.id - computes.length - 1) + '.' + cols[i];
     }
 
+    // Parsing
+    var l;
+    for (l = 0; l < data.length; l++) {
+      data[l][cols[0]] = data[l][cols[0]].toUpperCase().trim();
+      data[l][cols[0]] = data[l][cols[0]].charCodeAt(0) - 'A'.charCodeAt(0) + 1;
+    }
+
+    if (jiff_instance.id === 5 || jiff_instance.id === 6) {
+      for (l = 0; l < data.length; l++) {
+        data[l][cols[1]] = Number(data[l][cols[1]]);
+      }
+    } else if (jiff_instance.id === 7) {
+      for (l = 0; l < data.length; l++) {
+        data[l][cols[1]] = data[l][cols[1]].toLowerCase() === 'true' ? 1 : 2;
+      }
+    } else if (jiff_instance.id === 8) {
+      for (l = 0; l < data.length; l++) {
+        data[l][cols[1]] = data[l][cols[1]].toUpperCase().trim();
+        var ln = data[l][cols[1]].length;
+        data[l][cols[1]] = data[l][cols[1]].charCodeAt(ln-1) - 'A'.charCodeAt(0) + 1;
+      }
+    }
+
     // Compute party and analyst ids.
     var copy = computes.slice();
     copy.push(computes.length + 1);
diff --git a/presentation/linear-regression/server.js b/presentation/relational/server.js
similarity index 89%
rename from presentation/linear-regression/server.js
rename to presentation/relational/server.js
index 9d0704bcd..baaf6411f 100644
--- a/presentation/linear-regression/server.js
+++ b/presentation/relational/server.js
@@ -55,7 +55,8 @@ var initialize = function (jiff, computation_id, msg, params) {
   throw new Error('Unrecognized role and party id options');
 };
 
-require('../../lib/jiff-server').make_jiff(http, {logs: true, hooks: { beforeInitialization: [initialize] }});
+var jiff_instance = require('../../lib/jiff-server').make_jiff(http, {logs: true, hooks: { beforeInitialization: [initialize] }});
+jiff_instance.apply_extension(require('../../lib/ext/jiff-server-bignumber.js'));
 
 
 // Instructions
diff --git a/presentation/table-join-filter-count/input/input.html b/presentation/table-join-filter-count/input/input.html
deleted file mode 100644
index cac6a0bfd..000000000
--- a/presentation/table-join-filter-count/input/input.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- Basic UI for running the demo in the browser -->
-
-<html>
-  <head>
-    <title>Sum integers under MPC</title>
-    <style>
-      .error {
-        color: #FF0000;
-      }
-
-      td, th {
-        border: solid 1px darkgray;
-      }
-
-      th input, td input {
-        width: 70px;
-      }
-
-      .party5 {
-        background-color: #3e999f;
-      }
-      .party6 {
-        background-color: #710B02;
-      }
-      .party7 {
-        background-color: #cccccc;
-      }
-      .party8 {
-        background-color: #a5871f;
-      }
-    </style>
-    <script src="https://code.jquery.com/jquery-1.11.1.js"></script>
-    <script src="/socket.io/socket.io.js"></script>
-    <script src="/lib/sodium.js"></script>
-    <script src="/lib/jiff-client.js"></script>
-
-    <!-- Contains UI Handlers and Input Checks -->
-    <script type="text/javascript" src="/static/input/input.js"></script>
-
-    <!-- Contains the MPC implementation -->
-    <script type="text/javascript" src="/static/input/mpc.js"></script>
-  </head>
-  <body class="party{{id}}">
-    <h1>Input party {{ id - config.compute - 1}}</h1>
-    <h3>Join / Filter / Group By under MPC</h3>
-
-    <label for="cols">Enter the number of columns</label> <input id="cols" pattern="[0-9]+"> <br/>
-    <label for="rows">Enter the number of rows&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label> <input id="rows" pattern="[0-9]+"> <br/>
-    <button id="generate" onclick="generateTable(document.getElementById('cols').value, document.getElementById('rows').value)">Input</button>
-    <br/><br/>
-
-
-    <div id="input_area">
-
-    </div>
-    <button onclick="submit();" disabled="disabled" id="submit">Submit</button><br/>
-    <div id="output"></div>
-  </body>
-
-  <script type="text/javascript">
-    connect({{id}}, {{config.total}}, {{config.compute}}, '{{ config.computation_id }}');
-  </script>
-</html>
