diff --git a/app/Controller/AnalystDataController.php b/app/Controller/AnalystDataController.php
index c1fc94324..d9791777b 100644
--- a/app/Controller/AnalystDataController.php
+++ b/app/Controller/AnalystDataController.php
@@ -116,6 +116,13 @@ class AnalystDataController extends AppController
         $this->_setViewElements();
     }
 
+    public function getRelatedElement($type, $uuid)
+    {
+        $this->__typeSelector('Relationship');
+        $data = $this->AnalystData->getRelatedElement($this->Auth->user(), $type, $uuid);
+        return $this->RestResponse->viewData($data, 'json');
+    }
+
     private function __typeSelector($type) {
         foreach ($this->__valid_types as $vt) {
             if ($type === $vt) {
diff --git a/app/Model/AppModel.php b/app/Model/AppModel.php
index c104112fe..682518ec0 100644
--- a/app/Model/AppModel.php
+++ b/app/Model/AppModel.php
@@ -2070,6 +2070,7 @@ class AppModel extends Model
                     `modified` datetime ON UPDATE CURRENT_TIMESTAMP,
                     `distribution` tinyint(4) NOT NULL,
                     `sharing_group_id` int(10) unsigned,
+                    `relationship_type` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci,
                     `related_object_uuid` varchar(40) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL,
                     `related_object_type` varchar(80) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL,
                     PRIMARY KEY (`id`),
@@ -2080,6 +2081,7 @@ class AppModel extends Model
                     KEY `orgc_uuid` (`orgc_uuid`),
                     KEY `distribution` (`distribution`),
                     KEY `sharing_group_id` (`sharing_group_id`),
+                    KEY `relationship_type` (`relationship_type`),
                     KEY `related_object_uuid` (`related_object_uuid`),
                     KEY `related_object_type` (`related_object_type`)
                 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;";
diff --git a/app/Model/Relationship.php b/app/Model/Relationship.php
index 2163db5ec..ca864c86d 100644
--- a/app/Model/Relationship.php
+++ b/app/Model/Relationship.php
@@ -16,4 +16,108 @@ class Relationship extends AnalystData
 
     public $validate = array(
     );
+
+    /** @var object|null */
+    protected $Event;
+    /** @var object|null */
+    protected $Attribute;
+    /** @var object|null */
+    protected $Object;
+    /** @var object|null */
+    protected $Note;
+    /** @var object|null */
+    protected $Opinion;
+    /** @var object|null */
+    protected $Relationship;
+    /** @var object|null */
+    protected $User;
+    /** @var array|null */
+    private $__currentUser;
+
+    public function afterFind($results, $primary = false)
+    {
+        $results = parent::afterFind($results, $primary);
+        if (empty($this->__currentUser)) {
+            $user_id = Configure::read('CurrentUserId');
+            $this->User = ClassRegistry::init('User');
+            if ($user_id) {
+                $this->__currentUser = $this->User->getAuthUser($user_id);
+            }
+        }
+        foreach ($results as $i => $v) {
+            $results[$i][$this->alias]['related_object'] = $this->getRelatedElement($this->__currentUser, $v[$this->alias]['related_object_type'], $v[$this->alias]['related_object_uuid']);
+        }
+        return $results;
+    }
+
+    public function getRelatedElement(array $user, $type, $uuid): array
+    {
+        $data = [];
+        if ($type == 'Event') {
+            $this->Event = ClassRegistry::init('Event');
+            $params = [
+            ];
+            $data = $this->Event->fetchSimpleEvent($user, $uuid, $params);
+        } else if ($type == 'Attribute') {
+            $this->Attribute = ClassRegistry::init('Attribute');
+            $params = [
+                'conditions' => [
+                    ['Attribute.uuid' => $uuid],
+                ],
+                'contain' => ['Event' => 'Orgc',]
+            ];
+            $data = $this->Attribute->fetchAttributeSimple($user, $params);
+            $data = $this->rearrangeData($data, 'Attribute');
+            $data['Attribute']['Organisation'] = $data['Attribute']['Event']['Orgc'];
+            $data['Attribute']['orgc_uuid'] = $data['Attribute']['Event']['Orgc']['uuid'];
+            unset($data['Attribute']['Event']['Orgc']);
+        } else if ($type == 'Object') {
+            $this->Object = ClassRegistry::init('MispObject');
+            $params = [
+                'conditions' => [
+                    ['Object.uuid' => $uuid],
+                ]
+            ];
+            $data = $this->Object->fetchObjectSimple($user, $params);
+            if (!empty($data)) {
+                $data = $data[0];
+            }
+        } else if ($type == 'Note') {
+            $this->Note = ClassRegistry::init('Note');
+            $params = [
+
+            ];
+            $data = $this->Note->fetchNote();
+        } else if ($type == 'Opinion') {
+            $this->Opinion = ClassRegistry::init('Opinion');
+            $params = [
+
+            ];
+            $data = $this->Opinion->fetchOpinion();
+        } else if ($type == 'Relationship') {
+            $this->Relationship = ClassRegistry::init('Relationship');
+            $params = [
+
+            ];
+            $data = $this->Relationship->fetchRelationship();
+        }
+        return $data;
+    }
+
+    private function rearrangeData(array $data, $objectType): array
+    {
+        $models = ['Event', 'Attribute', 'Object', 'Organisation', ];
+        if (!empty($data)) {
+            foreach ($models as $model) {
+                if ($model == $objectType) {
+                    continue;
+                }
+                if (isset($data[$model])) {
+                    $data[$objectType][$model] = $data[$model];
+                    unset($data[$model]);
+                }
+            }
+        }
+        return $data;
+    }
 }
diff --git a/app/View/AnalystData/add.ctp b/app/View/AnalystData/add.ctp
index 97833100f..b471c9923 100644
--- a/app/View/AnalystData/add.ctp
+++ b/app/View/AnalystData/add.ctp
@@ -62,9 +62,27 @@ if ($modelSelection === 'Note') {
             ]
         ]
     );
-
 } else if ($modelSelection === 'Relationship') {
-
+    $fields = array_merge($fields,
+        [
+            [
+                'field' => 'relationship_type',
+                'class' => 'span4',
+            ],
+            [
+                'field' => 'related_object_type',
+                'class' => 'span2',
+                'options' => $dropdownData['valid_targets'],
+                'type' => 'dropdown',
+                'stayInLine' => 1
+            ],
+            [
+                'field' => 'related_object_uuid',
+                'class' => 'span4',
+            ],
+            sprintf('<div><label>%s:</label><div id="related-object-container">%s</div></div>', __('Related Object'), __('- No UUID provided -'))
+        ]
+    );
 }
 echo $this->element('genericElements/Form/genericForm', [
     'data' => [
@@ -98,8 +116,13 @@ if (!$ajax) {
         var noteHTMLID = '#' + data[noteType].note_type_name + '-' + data[noteType].id
         var $noteToReplace = $(noteHTMLID)
         if ($noteToReplace.length == 1) {
-            console.log(data);
-            var compiledUpdatedNote = renderNote(data[noteType])
+            var relatedObjects = {}
+            if (noteType == 'Relationship') {
+                var relationship = data[noteType]
+                relatedObjects[relationship['object_type']] = {}
+                relatedObjects[relationship['object_type']][relationship['related_object_uuid']] = relationship['related_object'][relationship['object_type']]
+            }
+            var compiledUpdatedNote = renderNote(data[noteType], relatedObjects)
             $noteToReplace[0].outerHTML = compiledUpdatedNote
             $(noteHTMLID).css({'opacity': 0})
             setTimeout(() => {
@@ -111,4 +134,52 @@ if (!$ajax) {
     function addNoteInUI(data) {
         location.reload()
     }
-</script>
\ No newline at end of file
+
+    function displayRelatedObject(data) {
+        if (Object.keys(data).length == 0) {
+            $('#related-object-container').html('<span class="text-muted"><?= __('Could not fetch remote object') ?></span>')
+        } else {
+            var parsed = syntaxHighlightJson(data)
+            $('#related-object-container').html(parsed)
+        }
+    }
+
+    function fetchAndDisplayRelatedObject(type, uuid) {
+        var url = baseurl + '/analystData/getRelatedElement/' + type + '/' + uuid
+        $.ajax({
+            type: "get",
+            url: url,
+            headers: { Accept: "application/json" },
+            success: function (data) {
+                console.log(data);
+                displayRelatedObject(data)
+            },
+            error: function (data, textStatus, errorThrown) {
+                showMessage('fail', textStatus + ": " + errorThrown);
+            }
+        });
+    }
+
+    $(document).ready(function() {
+        $('#RelationshipRelatedObjectType').change(function(e) {
+            if ($('#RelationshipRelatedObjectUuid').val().length == 36) {
+                fetchAndDisplayRelatedObject($('#RelationshipRelatedObjectType').val(),$('#RelationshipRelatedObjectUuid').val())
+            }
+        })
+        $('#RelationshipRelatedObjectUuid').on('input', function(e) {
+            if ($('#RelationshipRelatedObjectUuid').val().length == 36) {
+                fetchAndDisplayRelatedObject($('#RelationshipRelatedObjectType').val(),$('#RelationshipRelatedObjectUuid').val())
+            }
+        })
+    })
+</script>
+
+<style>
+    #related-object-container {
+        box-shadow: 0 0 5px 0px #22222266;
+        padding: 0.5rem;
+        max-height: 400px;
+        overflow: auto;
+        margin-bottom: 1rem;
+    }
+</style>
\ No newline at end of file
diff --git a/app/View/AnalystData/index.ctp b/app/View/AnalystData/index.ctp
index a0baa8d0d..60bbfb338 100644
--- a/app/View/AnalystData/index.ctp
+++ b/app/View/AnalystData/index.ctp
@@ -62,7 +62,20 @@
         );
     
     } else if ($modelSelection === 'Relationship') {
-    
+        $fields = array_merge($fields,
+            [
+                [
+                    'name' => __('Related Object Type'),
+                    'sort' => $modelSelection . '.related_object_type',
+                    'data_path' => $modelSelection . '.related_object_type'
+                ],
+                [
+                    'name' => __('Related Object UUID'),
+                    'sort' => $modelSelection . '.related_object_uuid',
+                    'data_path' => $modelSelection . '.related_object_uuid'
+                ],
+            ]
+        );
     }
 
     echo $this->element('genericElements/IndexTable/scaffold', [
diff --git a/app/View/Elements/genericElements/Analyst_data/generic.ctp b/app/View/Elements/genericElements/Analyst_data/generic.ctp
index 762fdbe10..a7a47cbc3 100644
--- a/app/View/Elements/genericElements/Analyst_data/generic.ctp
+++ b/app/View/Elements/genericElements/Analyst_data/generic.ctp
@@ -183,11 +183,7 @@ $notes2 = [
     ],
 ];
 
-$notes = $analyst_data['notes'] ?? [];
-$opinions = $analyst_data['opinions'] ?? [];
-$relationships = $analyst_data['relationships'] ?? [];
-
-$related_objects = [
+$related_objects2 = [
     'Event' => [
         'f80a0db2-24bd-4148-929e-7c803ade7ca1' => [
             'uuid' => 'f80a0db2-24bd-4148-929e-7c803ade7ca1',
@@ -240,38 +236,56 @@ $related_objects = [
     ],
 ];
 
-$notes = array_merge($notes, $opinions);
+$notes = $analyst_data['notes'] ?? [];
+$opinions = $analyst_data['opinions'] ?? [];
+$relationships = $analyst_data['relationships'] ?? [];
+$related_objects = [
+    'Attribute' => [],
+    'Event' => [],
+    'Object' => [],
+    'Organisation' => [],
+    'GalaxyCluster' => [],
+    'Galaxy' => [],
+    'Note' => [],
+    'Opinion' => [],
+    'SharingGroup' => [],
+];
+foreach ($relationships as $relationship) {
+    $related_objects[$relationship['object_type']][$relationship['related_object_uuid']] = $relationship['related_object'][$relationship['object_type']];
+}
+
+$notesOpinions = array_merge($notes, $opinions);
 
 if(!function_exists("countNotes")) {
-    function countNotes($notes) {
-        $notesTotalCount = count($notes);
+    function countNotes($notesOpinions) {
+        $notesTotalCount = count($notesOpinions);
         $notesCount = 0;
         $relationsCount = 0;
-        foreach ($notes as $note) {
-            if ($note['note_type'] == 2) { // relationship
+        foreach ($notesOpinions as $notesOpinion) {
+            if ($notesOpinion['note_type'] == 2) { // relationship
                 $relationsCount += 1;
             } else {
                 $notesCount += 1;
             }
-            if (!empty($note['Note'])) {
-                $nestedCounts = countNotes($note['Note']);
+            if (!empty($notesOpinion['Note'])) {
+                $nestedCounts = countNotes($notesOpinion['Note']);
                 $notesTotalCount += $nestedCounts['total'];
-                $notesCount += $nestedCounts['notes'];
+                $notesCount += $nestedCounts['notesOpinions'];
                 $relationsCount += $nestedCounts['relations'];
             }
-            if (!empty($note['Opinion'])) {
-                $nestedCounts = countNotes($note['Opinion']);
+            if (!empty($notesOpinion['Opinion'])) {
+                $nestedCounts = countNotes($notesOpinion['Opinion']);
                 $notesTotalCount += $nestedCounts['total'];
-                $notesCount += $nestedCounts['notes'];
+                $notesCount += $nestedCounts['notesOpinions'];
                 $relationsCount += $nestedCounts['relations'];
             }
         }
-        return ['total' => $notesTotalCount, 'notes' => $notesCount, 'relations' => $relationsCount];
+        return ['total' => $notesTotalCount, 'notesOpinions' => $notesCount, 'relations' => $relationsCount];
     }
 }
-$counts = countNotes($notes);
-$notesCount = $counts['notes'];
-$relationshipsCount = $counts['relations'];
+$counts = countNotes($notesOpinions);
+$notesOpinionCount = $counts['notesOpinions'];
+$relationshipsCount = count($relationships);
 ?>
 
 <?php if (empty($notes)): ?>
@@ -279,7 +293,7 @@ $relationshipsCount = $counts['relations'];
 <?php else: ?>
     <span class="label label-info useCursorPointer node-opener-<?= $seed ?>">
         <i class="<?= $this->FontAwesome->getClass('sticky-note') ?> useCursorPointer" title="<?= __('Notes and opinions for this UUID') ?>"></i>
-        <?= $notesCount; ?>
+        <?= $notesOpinionCount; ?>
         <i class="<?= $this->FontAwesome->getClass('project-diagram') ?> useCursorPointer" title="<?= __('Relationships for this UUID') ?>"></i>
         <?= $relationshipsCount; ?>
     </span>
@@ -288,7 +302,7 @@ $relationshipsCount = $counts['relations'];
 <script>
 
 
-function renderNote(note) {
+function renderNote(note, relationship_related_object) {
     note.modified_relative = note.modified ? moment(note.modified).fromNow() : note.modified
     note.created_relative = note.created ? moment(note.created).fromNow() : note.created
     note.modified = note.modified ? (new Date(note.modified)).toLocaleString() : note.modified
@@ -307,13 +321,86 @@ function renderNote(note) {
         note.opinion_color = note.opinion == 50 ? '#333' : ( note.opinion > 50 ? '#468847' : '#b94a48');
         note.opinion_text = (note.opinion  >= 81) ? '<?= __("Strongly Agree") ?>' : ((note.opinion  >= 61) ? '<?= __("Agree") ?>' : ((note.opinion  >= 41) ? '<?= __("Neutral") ?>' : ((note.opinion  >= 21) ? '<?= __("Disagree") ?>' : '<?= __("Strongly Disagree") ?>')))
         note.content = opinionTemplate(note)
-    } else if (note.note_type == 2){
-        note.content = renderRelationshipEntryFromType(note)
+    } else if (note.note_type == 2) {
+        note.content = renderRelationshipEntryFromType(note, relationship_related_object)
     }
     var noteHtml = baseNoteTemplate(note)
     return noteHtml
 }
 
+
+function getURLFromRelationship(note) {
+    if (note.related_object_type == 'Event') {
+        return baseurl + '/events/view/' + note.related_object_uuid
+    } else if (note.related_object_type == 'Attribute') {
+        return baseurl + '/events/view/' + note.attribute.event_id + '/focus:' + note.related_object_uuid
+    } else if (note.related_object_type == 'Object') {
+        return baseurl + '/events/view/' + note.object.event_id + '/focus:' + note.related_object_uuid
+    }
+    return '#'
+}
+
+function renderRelationshipEntryFromType(note, relationship_related_object) {
+    var contentHtml = ''
+    var template = doT.template('\
+        <span style="border: 1px solid #ddd !important; border-radius: 3px; padding: 0.25rem;"> \
+            <span class="ellipsis-overflow" style="max-width: 12em;">{{=it.related_object_type}}</span> \
+            :: \
+            <span class="ellipsis-overflow" style="max-width: 12em;">{{=it.related_object_uuid}}</span> \
+        </span> \
+    ')
+    if (note.related_object_type == 'Event' && relationship_related_object.Event[note.related_object_uuid]) {
+        note.event = relationship_related_object.Event[note.related_object_uuid]
+        template = doT.template('\
+            <span class="misp-element-wrapper attribute" title="<?= __('Event') ?>"> \
+                <span class="bold"> \
+                    <span class="attr-type"><span><i class="<?= $this->FontAwesome->getClass('envelope') ?>"></i></span></span> \
+                    <span class=""><span class="attr-value"> \
+                        <span class="ellipsis-overflow" style="max-width: 12em;"><a href="{{=it.url}}">{{=it.event.info}}</a></span> \
+                    </span></span> \
+                </span> \
+            </span> \
+        ')
+    } else if (note.related_object_type == 'Attribute' && relationship_related_object.Attribute[note.related_object_uuid]) {
+        note.attribute = relationship_related_object.Attribute[note.related_object_uuid]
+        if (note.attribute.object_relation !== undefined && note.attribute.object_relation !== null) {
+            template = doT.template('\
+            <span class="misp-element-wrapper object"> \
+                <span class="bold"> \
+                    <span class="obj-type"> \
+                        <span class="object-name" title="<?= __('Object') ?>">{{=it.attribute.object_name}}</span> \
+                        ↦ <span class="object-attribute-type" title="<?= __('Object Relation') ?>">{{=it.attribute.object_relation}}</span> \
+                    </span> \
+                <span class="obj-value"><span class="ellipsis-overflow" style="max-width: 12em;"><a href="{{=it.url}}">{{=it.attribute.value}}</a></span></span> \
+            </span> \
+        ')
+        } else if (relationship_related_object.Attribute[note.related_object_uuid]) {
+            template = doT.template('\
+                <span class="misp-element-wrapper attribute"> \
+                    <span class="bold"> \
+                        <span class="attr-type"><span title="<?= __('Attribute') ?>">{{=it.attribute.type}}</span></span> \
+                        <span class="blue"><span class="attr-value"><span class="ellipsis-overflow" style="max-width: 12em;"><a href="{{=it.url}}">{{=it.attribute.value}}</a></span></span></span> \
+                    </span> \
+                </span> \
+            ')
+        }
+    } else if (note.related_object_type == 'Object') {
+        note.object = relationship_related_object.Object[note.related_object_uuid]
+        template = doT.template('\
+            <i class="<?= $this->FontAwesome->getClass('cubes') ?>" title="<?= __('Object') ?>"></i> \
+            <span class="misp-element-wrapper object"> \
+                <span class="bold"> \
+                    <span class="obj-type"><span>{{=it.object.type}}</span></span> \
+                    <span class="blue"><span class="obj-value"><span class="ellipsis-overflow" style="max-width: 12em;"><a href="{{=it.url}}">{{=it.object.value}}</a></span></span></span> \
+                </span> \
+            </span> \
+        ')
+    }
+    note.url = getURLFromRelationship(note)
+    contentHtml = template(note)
+    return relationshipDefaultEntryTemplate({content: contentHtml, relationship_type: note.relationship_type, comment: note.comment})
+}
+
 var noteFilteringTemplate = '\
     <div class="btn-group notes-filtering-container" style="margin-bottom: 0.5rem"> \
         <btn class="btn btn-small btn-primary" href="#" onclick="filterNotes(this, \'all\')"><?= __('All notes') ?></btn> \
@@ -428,15 +515,15 @@ var replyNoteTemplate = doT.template('\
         {{=it.notes_html}} \
     </div> \
 ')
-var addNoteButton = '<button class="btn btn-small btn-block btn-primary" type="button" onclick="createNewNote(this, \'<?= $object_type ?>\', \'<?= $object_uuid ?>\')"> \
-    <i class="<?= $this->FontAwesome->getClass('plus') ?>"></i> <?= __('Add a note') ?> \
-</button>'
-var addOpinionButton = '<button class="btn btn-small btn-block btn-primary" style="margin-top: 2px;" type="button" onclick="createNewOpinion(this, \'<?= $object_type ?>\', \'<?= $object_uuid ?>\')"> \
-    <i class="<?= $this->FontAwesome->getClass('gavel') ?>"></i> <?= __('Add an opinion') ?> \
-</button>'
-var addRelationshipButton = '<button class="btn btn-small btn-block btn-primary" type="button" onclick="createNewRelationship(this, \'<?= $object_type ?>\', \'<?= $object_uuid ?>\')"> \
-    <i class="<?= $this->FontAwesome->getClass('plus') ?>"></i> <?= __('Add a relationship') ?> \
-</button>'
+// var addNoteButton = '<button class="btn btn-small btn-block btn-primary" type="button" onclick="createNewNote(this, \'<?= $object_type ?>\', \'<?= $object_uuid ?>\')"> \
+//     <i class="<?= $this->FontAwesome->getClass('plus') ?>"></i> <?= __('Add a note') ?> \
+// </button>'
+// var addOpinionButton = '<button class="btn btn-small btn-block btn-primary" style="margin-top: 2px;" type="button" onclick="createNewOpinion(this, \'<?= $object_type ?>\', \'<?= $object_uuid ?>\')"> \
+//     <i class="<?= $this->FontAwesome->getClass('gavel') ?>"></i> <?= __('Add an opinion') ?> \
+// </button>'
+// var addRelationshipButton = '<button class="btn btn-small btn-block btn-primary" type="button" onclick="createNewRelationship(this, \'<?= $object_type ?>\', \'<?= $object_uuid ?>\')"> \
+//     <i class="<?= $this->FontAwesome->getClass('plus') ?>"></i> <?= __('Add a relationship') ?> \
+// </button>'
 
 function toggleNotes(clicked) {
     var $container = $('.note-container-<?= $seed ?>')
@@ -478,6 +565,7 @@ var shortDist = <?= json_encode($shortDist) ?>;
 
 (function() {
     var notes = <?= json_encode($notes) ?>;
+    var relationships = <?= json_encode($relationships) ?>;
     var relationship_related_object = <?= json_encode($related_objects) ?>;
     var renderedNotes<?= $seed ?> = null
 
@@ -488,20 +576,20 @@ var shortDist = <?= json_encode($shortDist) ?>;
         })
     }
 
-    function renderNotes(notes) {
+    function renderNotes(notes, relationship_related_object) {
         var renderedNotesArray = []
         if (notes.length == 0)  {
             var emptyHtml = '<span style="text-align: center; color: #777;"><?= __('No notes for this UUID.') ?></span>'
             renderedNotesArray.push(emptyHtml)
         } else {
             notes.forEach(function(note) {
-                var noteHtml = renderNote(note)
+                var noteHtml = renderNote(note, relationship_related_object)
     
                 if (note.Opinion && note.Opinion.length > 0) { // The notes has more notes attached
-                    noteHtml += replyNoteTemplate({notes_html: renderNotes(note.Opinion)})
+                    noteHtml += replyNoteTemplate({notes_html: renderNotes(note.Opinion, relationship_related_object)})
                 }
                 if (note.Note && note.Note.length > 0) { // The notes has more notes attached
-                    noteHtml += replyNoteTemplate({notes_html: renderNotes(note.Note)})
+                    noteHtml += replyNoteTemplate({notes_html: renderNotes(note.Note, relationship_related_object)})
                 }
 
                 renderedNotesArray.push(noteHtml)
@@ -510,94 +598,32 @@ var shortDist = <?= json_encode($shortDist) ?>;
         return renderedNotesArray.join('')
     }
 
-    function renderAllNotesWithForm() {
+    function renderAllNotesWithForm(relationship_related_object) {
         var buttonContainer = '<div>' + addNoteButton + addOpinionButton + '</div>'
         renderedNotes<?= $seed ?> = nodeContainerTemplate({
-            content_notes: renderNotes(notes.filter(function(note) { return note.note_type != 2})) + buttonContainer,
-            content_relationships: renderNotes(notes.filter(function(note) { return note.note_type == 2})) + addRelationshipButton,
+            content_notes: renderNotes(notes.filter(function(note) { return note.note_type != 2}), relationship_related_object) + buttonContainer,
+            content_relationships: renderNotes(relationships, relationship_related_object) + addRelationshipButton,
         })
     }
 
-    function getURLFromRelationship(note) {
-        if (note.related_object_type == 'Event') {
-            return baseurl + '/events/view/' + note.related_object_uuid
-        } else if (note.related_object_type == 'Attribute') {
-            return baseurl + '/events/view/' + note.attribute.event_id + '/focus:' + note.related_object_uuid
-        } else if (note.related_object_type == 'Object') {
-            return baseurl + '/events/view/' + note.object.event_id + '/focus:' + note.related_object_uuid
-        }
-        return '#'
-    }
-
-    function renderRelationshipEntryFromType(note) {
-        var contentHtml = ''
-        var template = doT.template('\
-            <span style="border: 1px solid #ddd !important; border-radius: 3px; padding: 0.25rem;"> \
-                <span class="ellipsis-overflow" style="max-width: 12em;">{{=it.related_object_type}}</span> \
-                :: \
-                <span class="ellipsis-overflow" style="max-width: 12em;">{{=it.related_object_uuid}}</span> \
-            </span> \
-        ')
-        if (note.related_object_type == 'Event' && relationship_related_object.Event[note.related_object_uuid]) {
-            note.event = relationship_related_object.Event[note.related_object_uuid]
-            template = doT.template('\
-                <span class="misp-element-wrapper attribute" title="<?= __('Event') ?>"> \
-                    <span class="bold"> \
-                        <span class="attr-type"><span><i class="<?= $this->FontAwesome->getClass('envelope') ?>"></i></span></span> \
-                        <span class=""><span class="attr-value"> \
-                            <span class="ellipsis-overflow" style="max-width: 12em;"><a href="{{=it.url}}">{{=it.event.info}}</a></span> \
-                        </span></span> \
-                    </span> \
-                </span> \
-            ')
-        } else if (note.related_object_type == 'Attribute' && relationship_related_object.Attribute[note.related_object_uuid]) {
-            note.attribute = relationship_related_object.Attribute[note.related_object_uuid]
-            if (note.attribute.object_relation !== undefined && note.attribute.object_relation !== null) {
-                template = doT.template('\
-                <span class="misp-element-wrapper object"> \
-                    <span class="bold"> \
-                        <span class="obj-type"> \
-                            <span class="object-name" title="<?= __('Object') ?>">{{=it.attribute.object_name}}</span> \
-                            ↦ <span class="object-attribute-type" title="<?= __('Object Relation') ?>">{{=it.attribute.object_relation}}</span> \
-                        </span> \
-                    <span class="obj-value"><span class="ellipsis-overflow" style="max-width: 12em;"><a href="{{=it.url}}">{{=it.attribute.value}}</a></span></span> \
-                </span> \
-            ')
-            } else if (relationship_related_object.Attribute[note.related_object_uuid]) {
-                template = doT.template('\
-                    <span class="misp-element-wrapper attribute"> \
-                        <span class="bold"> \
-                            <span class="attr-type"><span title="<?= __('Attribute') ?>">{{=it.attribute.type}}</span></span> \
-                            <span class="blue"><span class="attr-value"><span class="ellipsis-overflow" style="max-width: 12em;"><a href="{{=it.url}}">{{=it.attribute.value}}</a></span></span></span> \
-                        </span> \
-                    </span> \
-                ')
-            }
-        } else if (note.related_object_type == 'Object') {
-            note.object = relationship_related_object.Object[note.related_object_uuid]
-            template = doT.template('\
-                <i class="<?= $this->FontAwesome->getClass('cubes') ?>" title="<?= __('Object') ?>"></i> \
-                <span class="misp-element-wrapper object"> \
-                    <span class="bold"> \
-                        <span class="obj-type"><span>{{=it.object.type}}</span></span> \
-                        <span class="blue"><span class="obj-value"><span class="ellipsis-overflow" style="max-width: 12em;"><a href="{{=it.url}}">{{=it.object.value}}</a></span></span></span> \
-                    </span> \
-                </span> \
-            ')
-        }
-        note.url = getURLFromRelationship(note)
-        contentHtml = template(note)
-        return relationshipDefaultEntryTemplate({content: contentHtml, relationship_type: note.relationship_type, comment: note.comment})
-    }
-
     function registerListeners() {
         $('.node-opener-<?= $seed ?>').click(function() {
             openNotes(this)
         })
     }
 
+    var addNoteButton = '<button class="btn btn-small btn-block btn-primary" type="button" onclick="createNewNote(this, \'<?= $object_type ?>\', \'<?= $object_uuid ?>\')"> \
+        <i class="<?= $this->FontAwesome->getClass('plus') ?>"></i> <?= __('Add a note') ?> \
+    </button>'
+    var addOpinionButton = '<button class="btn btn-small btn-block btn-primary" style="margin-top: 2px;" type="button" onclick="createNewOpinion(this, \'<?= $object_type ?>\', \'<?= $object_uuid ?>\')"> \
+        <i class="<?= $this->FontAwesome->getClass('gavel') ?>"></i> <?= __('Add an opinion') ?> \
+    </button>'
+    var addRelationshipButton = '<button class="btn btn-small btn-block btn-primary" type="button" onclick="createNewRelationship(this, \'<?= $object_type ?>\', \'<?= $object_uuid ?>\')"> \
+        <i class="<?= $this->FontAwesome->getClass('plus') ?>"></i> <?= __('Add a relationship') ?> \
+    </button>'
+
     $(document).ready(function() {
-        renderAllNotesWithForm()
+        renderAllNotesWithForm(relationship_related_object)
         registerListeners()
     })
 })()
@@ -645,7 +671,6 @@ var shortDist = <?= json_encode($shortDist) ?>;
         var noteHTMLID = '#' + data[noteType].note_type_name + '-' + data[noteType].id
         var $noteToReplace = $(noteHTMLID)
         if ($noteToReplace.length == 1) {
-            console.log(data);
             var compiledUpdatedNote = renderNote(data[noteType])
             $noteToReplace[0].outerHTML = compiledUpdatedNote
             $(noteHTMLID).css({'opacity': 0})
diff --git a/app/View/Elements/genericElements/SingleViews/Fields/uuidField.ctp b/app/View/Elements/genericElements/SingleViews/Fields/uuidField.ctp
index 19ebcbf09..f43ea22de 100644
--- a/app/View/Elements/genericElements/SingleViews/Fields/uuidField.ctp
+++ b/app/View/Elements/genericElements/SingleViews/Fields/uuidField.ctp
@@ -12,7 +12,6 @@
         $notes = !empty($field['notes']) ? $field['notes'] : Hash::extract($data, $field['notes_path']);
         $opinions = !empty($field['opinions']) ? $field['opinions'] : Hash::extract($data, $field['opinions_path']);
         $relationships = !empty($field['relationships']) ? $field['relationships'] : Hash::extract($data, $field['relationships_path']);
-        // echo $this->element('genericElements/Analyst_data/generic', ['notes' => $notes, 'object_uuid' => $uuid, 'object_type' => $field['object_type']]);
         echo $this->element('genericElements/Analyst_data/generic', [
             'analyst_data' => ['notes' => $notes, 'opinions' => $opinions, 'relationships' => $relationships],
             'object_uuid' => $uuid,
diff --git a/app/View/Elements/genericElements/shortUuidWithNotes.ctp b/app/View/Elements/genericElements/shortUuidWithNotes.ctp
index 28a66b5d2..962834e23 100644
--- a/app/View/Elements/genericElements/shortUuidWithNotes.ctp
+++ b/app/View/Elements/genericElements/shortUuidWithNotes.ctp
@@ -9,7 +9,7 @@
         $opinions = !empty($opinions) ? $opinions : [];
         $relationships = !empty($relationships) ? $relationships : [];
         echo $this->element('genericElements/Analyst_data/generic', [
-            'analyst_data' => ['notes' => $notes, 'opinions' => $opinions, 'relationships' => $relationships],
+            'analyst_data' => ['notes' => $notes, 'opinions' => $opinions, 'relationships' => $relationships,],
             'object_uuid' => $uuid,
             'object_type' => $object_type
         ]);
diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp
index f1ba0eec6..41b26b2e5 100644
--- a/app/View/Events/view.ctp
+++ b/app/View/Events/view.ctp
@@ -21,7 +21,6 @@
                     'object_type' => 'Event',
                     'notes_path' => 'Note',
                     'opinions_path' => 'Opinion',
-                    'relationships_path' => 'Relationship',
                     'action_buttons' => [
                         [
                             'url' => $baseurl . '/events/add/extends:' . h($event['Event']['uuid']),