diff --git a/index.js b/index.js
index 10e4ac4..0b8397e 100644
--- a/index.js
+++ b/index.js
@@ -1,15 +1,27 @@
-var iniparser = require('iniparser');
-var config = iniparser.parseSync('./config.ini');
+var fs = require('fs');
+var ini = require('ini');
+var expresso = require('sate24-expresso');
+var config = ini.parse(fs.readFileSync(__dirname + '/config.ini', 'utf-8'));
 
-var aaaHost = config.globals.aaa_host;
-
-HttpServer = require('sate24/httpserver.js');
-var httpServer = HttpServer.start(config);
+process.chdir(__dirname);
 
+var logger = require('sate24/logger.js').start();
+var HttpServer = require('sate24/httpserver.js');
 var aaa = require('sate24/aaa.js');
-HttpServer.setAaa(aaa);
-
 var partner = require('./partner-trugee.js');
 
-partner.start(config, aaa.callbackReport);
-aaa.start(config, partner);
+var matrix = aaa.prepareMatrix();
+
+var options = {
+    'aaa': aaa,
+    'logger': logger,
+    'config': config,
+    'matrix': matrix,
+}
+
+var httpServer = HttpServer.start(config, options);
+
+partner.start(config, aaa.callbackReport, options);
+aaa.start(config, partner, options);
+expresso.start(options);
+
diff --git a/package.json b/package.json
index 25ce4b2..05b3c2a 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
     "strftime": "~0.9.2",
     "url": "~0.10.3",
     "sate24-expresso": "git+http://gitlab.kodesumber.com/reload97/sate24-expresso.git",
-    "winston": "~2.1.1"
+    "winston": "~2.1.1",
+    "ini": "~1.3.4"
   }
 }
diff --git a/partner-trugee.js b/partner-trugee.js
index c8a4336..935e67f 100644
--- a/partner-trugee.js
+++ b/partner-trugee.js
@@ -6,6 +6,7 @@ var xml2js = require('xml2js').parseString;
 var strftime = require('strftime');
 var xor = require('base64-xor');
 var request = require('request');
+var winston = require('winston');
 
 var config;
 var callbackReport;