diff --git a/cap/config.py b/cap/config.py
index baeb4472a1..65aa701b56 100644
--- a/cap/config.py
+++ b/cap/config.py
@@ -844,3 +844,9 @@ def get_cms_stats_questionnaire_contacts():
     'strict_transport_security_max_age': 31556926,  # One year in seconds
     'strict_transport_security_preload': False,
 }
+
+# CERNBox Credentials for CERNBox/SWAN Integration
+# ================================================
+CERNBOX_HOST = 'https://cernbox.cern.ch'
+CERNBOX_USER = os.environ.get("CAP_CERNBOX_USER")
+CERNBOX_PASS = os.environ.get("CAP_CERNBOX_PASS")
diff --git a/cap/modules/deposit/api.py b/cap/modules/deposit/api.py
index ed0b796bc0..0f8e08302c 100644
--- a/cap/modules/deposit/api.py
+++ b/cap/modules/deposit/api.py
@@ -76,6 +76,7 @@
                           UpdateDepositPermission)
 
 from .review import Reviewable
+from .notebook import CERNBoxProvider
 
 _datastore = LocalProxy(lambda: current_app.extensions['security'].datastore)
 
@@ -118,7 +119,7 @@ def DEPOSIT_ACTIONS_NEEDS(id):
 }
 
 
-class CAPDeposit(Deposit, Reviewable):
+class CAPDeposit(Deposit, Reviewable, CERNBoxProvider):
     """Define API for changing deposit state."""
 
     deposit_fetcher = staticmethod(cap_deposit_fetcher)
@@ -698,6 +699,10 @@ def create(cls, data, id_=None, owner=current_user):
             # create files bucket
             bucket = Bucket.create()
             RecordsBuckets.create(record=deposit.model, bucket=bucket)
+
+            # add notebook/cernbox related stuff
+            deposit.init_cernbox_storage()
+
             # give owner permissions to the deposit
             if owner:
                 for permission in DEPOSIT_ACTIONS:
@@ -708,6 +713,7 @@ def create(cls, data, id_=None, owner=current_user):
 
                     db.session.flush()
 
+            deposit.commit()
             return deposit
 
     @classmethod
diff --git a/cap/modules/deposit/errors.py b/cap/modules/deposit/errors.py
index bd48431dcc..4cf341fe6b 100644
--- a/cap/modules/deposit/errors.py
+++ b/cap/modules/deposit/errors.py
@@ -124,3 +124,15 @@ def __init__(self, description, errors=None, **kwargs):
 
         self.description = description or self.description
         self.errors = [FieldError(e[0], e[1]) for e in errors.items()]
+
+
+class CERNBoxError(RESTException):
+    """Exception during review for analysis."""
+
+    code = 400
+
+    def __init__(self, description, **kwargs):
+        """Initialize exception."""
+        super().__init__(**kwargs)
+
+        self.description = description or 'A CERNBox error occurred.'
diff --git a/cap/modules/deposit/notebook.py b/cap/modules/deposit/notebook.py
new file mode 100644
index 0000000000..de7f002007
--- /dev/null
+++ b/cap/modules/deposit/notebook.py
@@ -0,0 +1,207 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of CERN Analysis Preservation Framework.
+# Copyright (C) 2016 CERN.
+#
+# CERN Analysis Preservation Framework is free software; you can redistribute
+# it and/or modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# CERN Analysis Preservation Framework is distributed in the hope that it will
+# be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with CERN Analysis Preservation Framework; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307, USA.
+#
+# In applying this license, CERN does not
+# waive the privileges and immunities granted to it by virtue of its status
+# as an Intergovernmental Organization or submit itself to any jurisdiction.
+"""Serializer for deposit reviews."""
+
+from __future__ import absolute_import, print_function
+
+import requests
+from flask import request
+from flask_login import current_user
+
+from invenio_deposit.api import index
+from invenio_deposit.utils import mark_as_action
+
+from cap.modules.deposit.errors import CERNBoxError
+from cap.modules.deposit.permissions import UpdateDepositPermission
+from cap.modules.deposit.utils import get_cernbox_creds, get_cern_common_name
+
+
+class CERNBoxProvider(object):
+    """Integration for CERNBox, upload files and share them."""
+
+    def init_cernbox_storage(self):
+        """
+        Initialize CERNBox for use with SWAN.
+        - Create a folder named after the analysis ID in CERNBox.
+        - Share the folder with the analysis owner, give full permissions
+        - the CERN common_name is required
+        """
+        username = get_cern_common_name(current_user)
+        if username:
+            depid = self['_deposit']['id']
+
+            # 1. create cernbox folder
+            response = self._create_folder(depid)
+            if not response.ok:
+                raise CERNBoxError('Could not create CERNBox folder.')
+
+            # 2. share with current user
+            response = self._share_folder(depid, 0, username, 'admin')
+            if not response.ok:
+                raise CERNBoxError(f'Could not share with user {username}.')
+
+            # 3. save to deposit and update
+            access = {'read': [], 'update': [], 'admin': []}
+            self['_notebook'] = {
+                'files': [],
+                'access': {
+                    'users': access,
+                    'groups': access
+                }
+            }
+
+    @index
+    @mark_as_action
+    def cernboxupload(self, pid=None):
+        """Upload an existing file, to the associated CERNBox folder."""
+        with UpdateDepositPermission(self).require(403):
+            if request:
+                data = request.get_json()
+                filename = data.get('filename')
+                filepath = data.get('filepath')
+
+                # retrieve file contents
+                try:
+                    file_obj = self.files[filename].obj
+                    file_content = open(file_obj.file.uri).read()
+                except KeyError:
+                    raise CERNBoxError(
+                        f'File {filename} could not be found in the analysis.')
+
+                # apply new path (optional)
+                new_file = f'{filepath}/{filename}' if filepath else filename
+                depid = self['_deposit']['id']
+
+                response = self._upload_to_folder(
+                    depid, new_file, file_content)
+                if not response.ok:
+                    raise CERNBoxError(f'Upload of {filename} failed.')
+
+                self['_notebook']['files'].append(new_file)
+
+            return self
+
+    @index
+    @mark_as_action
+    def cernboxshare(self, pid=None):
+        """Share your analysis folder, with groups/users."""
+        with UpdateDepositPermission(self).require(403):
+            if request:
+                data = request.get_json()
+                groups = data.get('groups', [])
+                users = data.get('users', [])
+                perm = data.get('permission')
+
+                depid = self['_deposit']['id']
+
+                for group in groups:
+                    response = self._share_folder(depid, 1, group, perm)
+                    if not response.ok:
+                        raise CERNBoxError(
+                            f'Could not provide {perm} permission to {group}.')
+                    self['_notebooks']['access']['groups'][perm].append(group)
+
+                for user in users:
+                    response = self._share_folder(depid, 0, user, perm)
+                    if not response.ok:
+                        raise CERNBoxError(
+                            f'Could not provide {perm} permission to {user}.')
+                    self['_notebooks']['access']['users'][perm].append(user)
+
+            return self
+
+    @index
+    @mark_as_action
+    def cernboxdelete(self, pid=None):
+        """Share your analysis folder, with groups/users."""
+        with UpdateDepositPermission(self).require(403):
+            if request:
+                data = request.get_json()
+                path = data.get('permission')
+
+                depid = self['_deposit']['id']
+                path = f'{depid}/{path}'
+
+                response = self._delete_folder(path)
+                if not response.ok:
+                    raise CERNBoxError(f'Could not delete {path}.')
+                # need to delete files as well, need to think about that
+                # files - folders, how to handle?
+                # maybe save them differently? tree structure?
+            return self
+
+    def _create_folder(self, depid):
+        """Create a folder in CERNBox, named after the current analysis."""
+        host, user, password, auth = get_cernbox_creds()
+        response = requests.request(
+            'MKCOL',
+            url=f'{host}/remote.php/dav/files/{user}/{depid}',
+            auth=auth
+        )
+        return response
+
+    def _upload_to_folder(self, depid, new_file, file_content):
+        """Upload a file to CERNBox."""
+        host, user, password, auth = get_cernbox_creds()
+        response = requests.put(
+            url=f'{host}/remote.php/dav/files/{user}/{depid}/{new_file}',
+            data=file_content,
+            auth=auth,
+            headers={'Content-Type': 'application/octet-stream'}
+        )
+        return response
+
+    def _share_folder(self, depid, _type, _with, perm):
+        """
+        Share request for users/groups, providing specific permissions.
+        more info: https://doc.owncloud.org/server/9.0/developer_manual/core/ocs-share-api.html  # noqa
+        Important: shareType: 0 for users, 1 for groups
+                   permissions: 1-read, 2-update, 31-admin
+        """
+        host, _, _, auth = get_cernbox_creds()
+        permissions = {
+            'read': 1,
+            'update': 2,
+            'admin': 31
+        }
+
+        response = requests.post(
+            url=f'{host}/ocs/v2.php/apps/files_sharing/api/v1/shares?format=json',  # noqa
+            data={
+                "shareType": _type,
+                "shareWith": _with,
+                "permissions": permissions[perm],
+                "path": f'/{depid}'
+            },
+            auth=auth
+        )
+        return response
+
+    def _delete_folder(self, path):
+        host, user, password, auth = get_cernbox_creds()
+        response = requests.delete(
+            url=f'{host}/remote.php/dav/files/{user}/{path}',
+            auth=auth
+        )
+        return response
diff --git a/cap/modules/deposit/utils.py b/cap/modules/deposit/utils.py
index 6e551cdb52..3189c39a60 100644
--- a/cap/modules/deposit/utils.py
+++ b/cap/modules/deposit/utils.py
@@ -24,11 +24,14 @@
 """CAP Deposit utils."""
 
 from __future__ import absolute_import, print_function
+from flask import current_app
+from requests.auth import HTTPBasicAuth
 
 from invenio_access.models import Role
 from invenio_db import db
 
 from cap.modules.records.utils import url_to_api_url
+from cap.modules.user.utils import get_remote_account_by_id
 
 
 def clean_empty_values(data):
@@ -75,3 +78,21 @@ def add_api_to_links(links):
             item['links'] = add_api_to_links(item.get('links'))
 
     return response
+
+
+def get_cernbox_creds():
+    """Credentials for CERNBox."""
+    host = current_app.config.get('CERNBOX_HOST')
+    user = current_app.config.get('CERNBOX_USER')
+    password = current_app.config.get('CERNBOX_PASS')
+    auth = HTTPBasicAuth(user, password)
+
+    return host, user, password, auth
+
+
+def get_cern_common_name(user):
+    """Get a user's common_name from CERN data."""
+    user_profile = get_remote_account_by_id(user.id)['profile']
+    username = user_profile.get('common_name')
+    # TODO: add LDAP search (maybe)
+    return username
diff --git a/scripts/cap.wordlist b/scripts/cap.wordlist
index 194dd659e0..9751fe5f51 100644
--- a/scripts/cap.wordlist
+++ b/scripts/cap.wordlist
@@ -24,3 +24,5 @@ oauthclient
 serializers
 schemas
 url
+cernbox
+wip