diff --git a/api/businesslogic/security/UserContext.php b/api/businesslogic/security/UserContext.php
new file mode 100644
index 00000000..ec99ccf9
--- /dev/null
+++ b/api/businesslogic/security/UserContext.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace BusinessLogic\Security;
+
+
+class UserContext {
+    public $id;
+    public $username;
+    public $admin;
+    public $name;
+    public $email;
+    public $signature;
+    public $language;
+    public $categories;
+    public $permissions;
+
+    /**
+     * @var UserContextPreferences
+     */
+    public $preferences;
+
+    /**
+     * @var UserContextNotifications
+     */
+    public $notificationSettings;
+    public $autoAssign;
+    public $ratingNegative;
+    public $ratingPositive;
+    public $rating;
+    public $totalNumberOfReplies;
+    public $active;
+}
\ No newline at end of file
diff --git a/api/businesslogic/security/UserContextBuilder.php b/api/businesslogic/security/UserContextBuilder.php
new file mode 100644
index 00000000..5e63741b
--- /dev/null
+++ b/api/businesslogic/security/UserContextBuilder.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace BusinessLogic\Security;
+
+
+class UserContextBuilder {
+    static function buildUserContext($authToken, $hesk_settings) {
+        //$userForToken = gateway.getUserForToken($authToken);
+
+    }
+
+    /**
+     * Builds a user context based on the current session. **The session must be active!**
+     * @return UserContext the built user context
+     */
+    static function fromSession() {
+        require_once(__DIR__ . '/UserContext.php');
+        require_once(__DIR__ . '/UserContextPreferences.php');
+
+        $userContext = new UserContext();
+        $userContext->id = $_SESSION['id'];
+        $userContext->username = $_SESSION['user'];
+        $userContext->admin = $_SESSION['isadmin'];
+        $userContext->name = $_SESSION['name'];
+        $userContext->email = $_SESSION['email'];
+        $userContext->signature = $_SESSION['signature'];
+        $userContext->language = $_SESSION['language'];
+        $userContext->categories = explode(',', $_SESSION['categories']);
+
+        $preferences = new UserContextPreferences();
+        $preferences->afterReply = $_SESSION['afterreply'];
+        $preferences->autoStartTimeWorked = $_SESSION['autostart'];
+        $preferences-
+
+
+        return $userContext;
+    }
+}
\ No newline at end of file
diff --git a/api/businesslogic/security/UserContextNotifications.php b/api/businesslogic/security/UserContextNotifications.php
new file mode 100644
index 00000000..caada957
--- /dev/null
+++ b/api/businesslogic/security/UserContextNotifications.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: user
+ * Date: 1/19/17
+ * Time: 8:51 PM
+ */
+
+namespace BusinessLogic\Security;
+
+
+class UserContextNotifications {
+    public $newUnassigned;
+    public $newAssignedToMe;
+    public $replyUnassigned;
+    public $replyToMe;
+    public $privateMessage;
+    public $noteOnTicketAssignedToMe;
+    public $noteOnTicketNotAssignedToMe;
+    public $overdueTicketUnassigned;
+}
\ No newline at end of file
diff --git a/api/businesslogic/security/UserContextPreferences.php b/api/businesslogic/security/UserContextPreferences.php
new file mode 100644
index 00000000..37c73e23
--- /dev/null
+++ b/api/businesslogic/security/UserContextPreferences.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: user
+ * Date: 1/19/17
+ * Time: 8:49 PM
+ */
+
+namespace BusinessLogic\Security;
+
+
+class UserContextPreferences {
+    public $afterReply;
+    public $autoStartTimeWorked;
+    public $autoreload;
+    public $defaultNotifyCustomerNewTicket;
+    public $defaultNotifyCustomerReply;
+    public $showSuggestedKnowledgebaseArticles;
+    public $defaultCalendarView;
+    public $defaultTicketView;
+}
\ No newline at end of file
diff --git a/api/dao/CategoryGateway.php b/api/dao/CategoryGateway.php
index 47886f2c..2ae16bee 100644
--- a/api/dao/CategoryGateway.php
+++ b/api/dao/CategoryGateway.php
@@ -39,6 +39,8 @@ class CategoryGateway {
             $results[$category->id] = $category;
         }
 
+        hesk_dbClose();
+
         return $results;
     }
 }
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index 0529e779..c7e90a44 100644
--- a/api/index.php
+++ b/api/index.php
@@ -35,8 +35,15 @@ function handle404() {
     print json_encode('404 found');
 }
 
+function assertApiIsEnabled() {
+    //-- TODO
+}
+
 // Must use fully-qualified namespace to controllers
+Link::before('assertApiIsEnabled');
+
 Link::all(array(
+    '/' => 'assertApiIsEnabled',
     '/test/{i}' => '\Controllers\Category\CategoryController',
     '404' => 'handle404'
 ));
\ No newline at end of file