diff --git a/waltz-data/src/main/java/org/finos/waltz/data/change_unit/ChangeUnitIdSelectorFactory.java b/waltz-data/src/main/java/org/finos/waltz/data/change_unit/ChangeUnitIdSelectorFactory.java
index 72104987f5..49ef005b89 100644
--- a/waltz-data/src/main/java/org/finos/waltz/data/change_unit/ChangeUnitIdSelectorFactory.java
+++ b/waltz-data/src/main/java/org/finos/waltz/data/change_unit/ChangeUnitIdSelectorFactory.java
@@ -46,7 +46,8 @@ public Select<Record1<Long>> apply(IdSelectionOptions options) {
         switch(options.entityReference().kind()) {
             case ACTOR:
             case APPLICATION:
-                // all physical flows where the app is a source or target
+            case END_USER_APPLICATION:
+                // all physical flows where the node is a source or target
                 return mkForFlowEndpoint(options);
             case ALL:
             case APP_GROUP:
diff --git a/waltz-data/src/main/java/org/finos/waltz/data/flow_diagram/FlowDiagramEntityDao.java b/waltz-data/src/main/java/org/finos/waltz/data/flow_diagram/FlowDiagramEntityDao.java
index 9e1d3c61ba..43871a4e94 100644
--- a/waltz-data/src/main/java/org/finos/waltz/data/flow_diagram/FlowDiagramEntityDao.java
+++ b/waltz-data/src/main/java/org/finos/waltz/data/flow_diagram/FlowDiagramEntityDao.java
@@ -63,23 +63,23 @@ public class FlowDiagramEntityDao {
             EntityKind.ACTOR,
             EntityKind.CHANGE_INITIATIVE,
             EntityKind.DATA_TYPE,
+            EntityKind.END_USER_APPLICATION,
             EntityKind.LOGICAL_DATA_FLOW,
             EntityKind.MEASURABLE,
             EntityKind.PHYSICAL_FLOW);
 
-    private static Field<String> ENTITY_NAME_FIELD = InlineSelectFieldFactory.mkNameField(
+    private static final Field<String> ENTITY_NAME_FIELD = InlineSelectFieldFactory.mkNameField(
             fde.ENTITY_ID,
             fde.ENTITY_KIND,
             POSSIBLE_ENTITY_KINDS);
 
 
-    private static Field<String> ENTITY_LIFECYCLE_PHASE_FIELD = InlineSelectFieldFactory.mkEntityLifecycleField(
+    private static final Field<String> ENTITY_LIFECYCLE_PHASE_FIELD = InlineSelectFieldFactory.mkEntityLifecycleField(
             fde.ENTITY_ID,
             fde.ENTITY_KIND,
             POSSIBLE_ENTITY_KINDS);
 
 
-
     private static final RecordMapper<Record, FlowDiagramEntity> TO_DOMAIN_MAPPER = r -> {
         FlowDiagramEntityRecord record = r.into(FLOW_DIAGRAM_ENTITY);
         EntityReference ref = mkRef(
diff --git a/waltz-data/src/main/java/org/finos/waltz/data/logical_flow/LogicalFlowDao.java b/waltz-data/src/main/java/org/finos/waltz/data/logical_flow/LogicalFlowDao.java
index d43a03d6e1..062f4854ef 100644
--- a/waltz-data/src/main/java/org/finos/waltz/data/logical_flow/LogicalFlowDao.java
+++ b/waltz-data/src/main/java/org/finos/waltz/data/logical_flow/LogicalFlowDao.java
@@ -85,23 +85,23 @@ public class LogicalFlowDao {
     private static final Field<String> SOURCE_NAME_FIELD = InlineSelectFieldFactory.mkNameField(
             LOGICAL_FLOW.SOURCE_ENTITY_ID,
             LOGICAL_FLOW.SOURCE_ENTITY_KIND,
-            newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR));
+            newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR, EntityKind.END_USER_APPLICATION));
 
 
     private static final Field<String> TARGET_NAME_FIELD = InlineSelectFieldFactory.mkNameField(
             LOGICAL_FLOW.TARGET_ENTITY_ID,
             LOGICAL_FLOW.TARGET_ENTITY_KIND,
-            newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR));
+            newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR, EntityKind.END_USER_APPLICATION));
 
     private static final Field<String> SOURCE_EXTERNAL_ID_FIELD = InlineSelectFieldFactory.mkExternalIdField(
             LOGICAL_FLOW.SOURCE_ENTITY_ID,
             LOGICAL_FLOW.SOURCE_ENTITY_KIND,
-            newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR));
+            newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR, EntityKind.END_USER_APPLICATION));
 
     private static final Field<String> TARGET_EXTERNAL_ID_FIELD = InlineSelectFieldFactory.mkExternalIdField(
             LOGICAL_FLOW.TARGET_ENTITY_ID,
             LOGICAL_FLOW.TARGET_ENTITY_KIND,
-            newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR));
+            newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR, EntityKind.END_USER_APPLICATION));
 
 
     public static final RecordMapper<Record, LogicalFlow> TO_DOMAIN_MAPPER = r -> {
diff --git a/waltz-data/src/main/java/org/finos/waltz/data/logical_flow/LogicalFlowIdSelectorFactory.java b/waltz-data/src/main/java/org/finos/waltz/data/logical_flow/LogicalFlowIdSelectorFactory.java
index 2a127f1196..1d798eb351 100644
--- a/waltz-data/src/main/java/org/finos/waltz/data/logical_flow/LogicalFlowIdSelectorFactory.java
+++ b/waltz-data/src/main/java/org/finos/waltz/data/logical_flow/LogicalFlowIdSelectorFactory.java
@@ -18,6 +18,7 @@
 
 package org.finos.waltz.data.logical_flow;
 
+import org.finos.waltz.model.EntityReference;
 import org.finos.waltz.schema.tables.Application;
 import org.finos.waltz.data.IdSelectorFactory;
 import org.finos.waltz.data.SelectorUtilities;
@@ -62,7 +63,8 @@ public Select<Record1<Long>> apply(IdSelectionOptions options) {
         checkNotNull(options, "options cannot be null");
         switch (options.entityReference().kind()) {
             case ACTOR:
-                return mkForActor(options);
+            case END_USER_APPLICATION:
+                return mkForSpecificNode(options);
             case ALL:
             case APPLICATION:
             case APP_GROUP:
@@ -93,14 +95,16 @@ public Select<Record1<Long>> apply(IdSelectionOptions options) {
         }
     }
 
-    private Select<Record1<Long>> mkForActor(IdSelectionOptions options) {
+
+    private Select<Record1<Long>> mkForSpecificNode(IdSelectionOptions options) {
         SelectorUtilities.ensureScopeIsExact(options);
+        EntityReference ref = options.entityReference();
 
-        Condition sourceCondition = LOGICAL_FLOW.SOURCE_ENTITY_ID.eq(options.entityReference().id())
-                .and(LOGICAL_FLOW.SOURCE_ENTITY_KIND.eq(EntityKind.ACTOR.name()));
+        Condition sourceCondition = LOGICAL_FLOW.SOURCE_ENTITY_ID.eq(ref.id())
+                .and(LOGICAL_FLOW.SOURCE_ENTITY_KIND.eq(ref.kind().name()));
 
-        Condition targetCondition = LOGICAL_FLOW.TARGET_ENTITY_ID.eq(options.entityReference().id())
-                .and(LOGICAL_FLOW.TARGET_ENTITY_KIND.eq(EntityKind.ACTOR.name()));
+        Condition targetCondition = LOGICAL_FLOW.TARGET_ENTITY_ID.eq(ref.id())
+                .and(LOGICAL_FLOW.TARGET_ENTITY_KIND.eq(ref.kind().name()));
 
         return DSL
                 .select(LOGICAL_FLOW.ID)
diff --git a/waltz-data/src/main/java/org/finos/waltz/data/logical_flow/LogicalFlowStatsDao.java b/waltz-data/src/main/java/org/finos/waltz/data/logical_flow/LogicalFlowStatsDao.java
index 6ab5f98024..73a44836f7 100644
--- a/waltz-data/src/main/java/org/finos/waltz/data/logical_flow/LogicalFlowStatsDao.java
+++ b/waltz-data/src/main/java/org/finos/waltz/data/logical_flow/LogicalFlowStatsDao.java
@@ -76,6 +76,7 @@ public class LogicalFlowStatsDao {
     private static final org.finos.waltz.schema.tables.LogicalFlowDecorator lfd = LogicalFlowDecorator.LOGICAL_FLOW_DECORATOR.as("lfd");
     private static final Application counterpart_app = APPLICATION.as("counterpart_app");
     private static final Actor counterpart_actor = ACTOR.as("counterpart_actor");
+    private static final EndUserApplication counterpart_euc = END_USER_APPLICATION.as("counterpart_euc");
     private static final DataType rollup_dt = Tables.DATA_TYPE.as("rollup_dt");
     private static final DataType actual_dt = Tables.DATA_TYPE.as("actual_dt");
 
@@ -256,8 +257,10 @@ public Map<FlowDirection, Set<FlowInfo>> getFlowInfoByDirection(EntityReference
 
         Condition sourceAppCondition = lf.SOURCE_ENTITY_ID.eq(counterpart_app.ID).and(lf.SOURCE_ENTITY_KIND.eq(EntityKind.APPLICATION.name()));
         Condition sourceActorCondition = lf.SOURCE_ENTITY_ID.eq(counterpart_actor.ID).and(lf.SOURCE_ENTITY_KIND.eq(EntityKind.ACTOR.name()));
+        Condition sourceEucCondition = lf.SOURCE_ENTITY_ID.eq(counterpart_euc.ID).and(lf.SOURCE_ENTITY_KIND.eq(EntityKind.END_USER_APPLICATION.name()));
         Condition targetAppCondition = lf.TARGET_ENTITY_ID.eq(counterpart_app.ID).and(lf.TARGET_ENTITY_KIND.eq(EntityKind.APPLICATION.name()));
         Condition targetActorCondition = lf.TARGET_ENTITY_ID.eq(counterpart_actor.ID).and(lf.TARGET_ENTITY_KIND.eq(EntityKind.ACTOR.name()));
+        Condition targetEucCondition = lf.TARGET_ENTITY_ID.eq(counterpart_euc.ID).and(lf.TARGET_ENTITY_KIND.eq(EntityKind.END_USER_APPLICATION.name()));
 
         Condition dataTypeCondition = datatypeId == null ? rollup_dt.PARENT_ID.isNull() : rollup_dt.PARENT_ID.eq(datatypeId);
 
@@ -267,6 +270,7 @@ public Map<FlowDirection, Set<FlowInfo>> getFlowInfoByDirection(EntityReference
         SelectConditionStep<Record11<Long, Long, String, Long, Long, String, String, Long, String, String, String>> sourceQry = mkDirectionalQuery(
                 sourceAppCondition,
                 sourceActorCondition,
+                sourceEucCondition,
                 dataTypeCondition,
                 isDownstream,
                 INBOUND);
@@ -274,6 +278,7 @@ public Map<FlowDirection, Set<FlowInfo>> getFlowInfoByDirection(EntityReference
         SelectConditionStep<Record11<Long, Long, String, Long, Long, String, String, Long, String, String, String>> targetQry = mkDirectionalQuery(
                 targetAppCondition,
                 targetActorCondition,
+                targetEucCondition,
                 dataTypeCondition,
                 isUpstream,
                 OUTBOUND);
@@ -315,6 +320,7 @@ record -> {
 
     private SelectConditionStep<Record11<Long, Long, String, Long, Long, String, String, Long, String, String, String>> mkDirectionalQuery(Condition appDirectionCondition,
                                                                                                                                            Condition actorDirectionCondition,
+                                                                                                                                           Condition eucDirectionCondition,
                                                                                                                                            Condition dataTypeCondition,
                                                                                                                                            Condition parentDirection,
                                                                                                                                            FlowDirection direction) {
@@ -326,10 +332,13 @@ private SelectConditionStep<Record11<Long, Long, String, Long, Long, String, Str
                         FLOW_CLASSIFICATION.ID,
                         actual_dt.ID,
                         actual_dt.NAME,
-                        DSL.when(counterpart_app.ID.isNotNull(), DSL.val("APPLICATION")).otherwise(DSL.val("ACTOR")).as("counterpart_kind"),
-                        DSL.coalesce(counterpart_app.ID, counterpart_actor.ID).as("counterpart_id"),
+                        DSL.when(counterpart_app.ID.isNotNull(), DSL.val(EntityKind.APPLICATION.name()))
+                            .when(counterpart_actor.ID.isNotNull(), DSL.val(EntityKind.ACTOR.name()))
+                            .when(counterpart_euc.ID.isNotNull(), DSL.val(EntityKind.END_USER_APPLICATION.name()))
+                            .as("counterpart_kind"),
+                        DSL.coalesce(counterpart_app.ID, counterpart_actor.ID, counterpart_euc.ID).as("counterpart_id"),
                         lf.ENTITY_LIFECYCLE_STATUS,
-                        DSL.coalesce(counterpart_app.NAME, counterpart_actor.NAME).as("counterpart_name"),
+                        DSL.coalesce(counterpart_app.NAME, counterpart_actor.NAME, counterpart_euc.NAME).as("counterpart_name"),
                         DSL.val(direction.name()).as("direction"))
                 .from(lf)
                 .innerJoin(lfd).on(lf.ID.eq(lfd.LOGICAL_FLOW_ID))
@@ -341,6 +350,7 @@ private SelectConditionStep<Record11<Long, Long, String, Long, Long, String, Str
                 .innerJoin(FLOW_CLASSIFICATION).on(lfd.RATING.eq(FLOW_CLASSIFICATION.CODE))
                 .leftJoin(counterpart_app).on(appDirectionCondition)
                 .leftJoin(counterpart_actor).on(actorDirectionCondition)
+                .leftJoin(counterpart_euc).on(eucDirectionCondition)
                 .where(NOT_REMOVED)
                 .and(dataTypeCondition)
                 .and(parentDirection);
diff --git a/waltz-data/src/main/java/org/finos/waltz/data/physical_flow/PhysicalFlowIdSelectorFactory.java b/waltz-data/src/main/java/org/finos/waltz/data/physical_flow/PhysicalFlowIdSelectorFactory.java
index 5ff9ab86ce..427b9de915 100644
--- a/waltz-data/src/main/java/org/finos/waltz/data/physical_flow/PhysicalFlowIdSelectorFactory.java
+++ b/waltz-data/src/main/java/org/finos/waltz/data/physical_flow/PhysicalFlowIdSelectorFactory.java
@@ -63,6 +63,7 @@ public Select<Record1<Long>> apply(IdSelectionOptions options) {
             case APPLICATION:
             case ACTOR:
             case APP_GROUP:
+            case END_USER_APPLICATION:
             case CHANGE_INITIATIVE:
             case MEASURABLE:
             case ORG_UNIT:
diff --git a/waltz-data/src/main/java/org/finos/waltz/data/physical_specification/PhysicalSpecificationIdSelectorFactory.java b/waltz-data/src/main/java/org/finos/waltz/data/physical_specification/PhysicalSpecificationIdSelectorFactory.java
index d490fb6e67..ce33e7d16d 100644
--- a/waltz-data/src/main/java/org/finos/waltz/data/physical_specification/PhysicalSpecificationIdSelectorFactory.java
+++ b/waltz-data/src/main/java/org/finos/waltz/data/physical_specification/PhysicalSpecificationIdSelectorFactory.java
@@ -51,7 +51,8 @@ public Select<Record1<Long>> apply(IdSelectionOptions options) {
         switch(options.entityReference().kind()) {
             case ACTOR:
             case APPLICATION:
-                return mkForApplicationOrActor(options);
+            case END_USER_APPLICATION:
+                return mkForSpecificNode(options);
             case PHYSICAL_FLOW:
                 return mkForPhysicalFlow(options);
             case LOGICAL_DATA_ELEMENT:
@@ -72,7 +73,7 @@ public Select<Record1<Long>> apply(IdSelectionOptions options) {
     }
 
 
-    private Select<Record1<Long>> mkForApplicationOrActor(IdSelectionOptions options) {
+    private Select<Record1<Long>> mkForSpecificNode(IdSelectionOptions options) {
         SelectorUtilities.ensureScopeIsExact(options);
 
         Condition lifecycleCondition = options.entityLifecycleStatuses().contains(EntityLifecycleStatus.REMOVED)
diff --git a/waltz-data/src/main/java/org/finos/waltz/data/process_diagram/ProcessDiagramIdSelectorFactory.java b/waltz-data/src/main/java/org/finos/waltz/data/process_diagram/ProcessDiagramIdSelectorFactory.java
index 37b1ddeed3..0f1327eb2c 100644
--- a/waltz-data/src/main/java/org/finos/waltz/data/process_diagram/ProcessDiagramIdSelectorFactory.java
+++ b/waltz-data/src/main/java/org/finos/waltz/data/process_diagram/ProcessDiagramIdSelectorFactory.java
@@ -42,6 +42,8 @@ public Select<Record1<Long>> apply(IdSelectionOptions options) {
         checkNotNull(options, "options cannot be null");
         switch(options.entityReference().kind()) {
             case ACTOR:
+            case END_USER_APPLICATION:
+                return mkForSpecificEntity(options);
             case ALL:
             case APPLICATION:
             case CHANGE_INITIATIVE:
@@ -58,6 +60,18 @@ public Select<Record1<Long>> apply(IdSelectionOptions options) {
     }
 
 
+    private Select<Record1<Long>> mkForSpecificEntity(IdSelectionOptions options) {
+
+        return DSL
+                .select(PROCESS_DIAGRAM_ENTITY.DIAGRAM_ID)
+                .from(PROCESS_DIAGRAM_ENTITY)
+                .innerJoin(MEASURABLE_RATING).on(PROCESS_DIAGRAM_ENTITY.ENTITY_ID.eq(MEASURABLE_RATING.MEASURABLE_ID)
+                        .and(PROCESS_DIAGRAM_ENTITY.ENTITY_KIND.eq(EntityKind.MEASURABLE.name())))
+                .where(MEASURABLE_RATING.ENTITY_ID.eq(options.entityReference().id())
+                        .and(MEASURABLE_RATING.ENTITY_KIND.eq(options.entityReference().kind().name())));
+    }
+
+
     private Select<Record1<Long>> mkViaApplication(IdSelectionOptions options) {
 
         Select<Record1<Long>> relatedApplications = applicationIdSelectorFactory.apply(options);
diff --git a/waltz-ng/client/common/entity-utils.js b/waltz-ng/client/common/entity-utils.js
index ece55b4de6..428b2f2558 100644
--- a/waltz-ng/client/common/entity-utils.js
+++ b/waltz-ng/client/common/entity-utils.js
@@ -20,6 +20,9 @@
 import _ from "lodash";
 import {checkIsEntityRef} from "./checks";
 import {CORE_API} from "./services/core-api-utils";
+import {applicationStore} from "../svelte-stores/application-store";
+import {actorStore} from "../svelte-stores/actor-store";
+import {endUserApplicationStore} from "../svelte-stores/end-user-application-store";
 
 export function sameRef(r1, r2, options = { skipChecks: false }) {
     if (! options.skipChecks) {
@@ -138,6 +141,20 @@ export function loadEntity(serviceBroker, entityRef) {
 }
 
 
+export function loadSvelteEntity(entityRef, force = false) {
+    const id = entityRef.id;
+    switch (entityRef.kind) {
+        case "APPLICATION":
+            return applicationStore.getById(id, force);
+        case "ACTOR":
+            return actorStore.getById(id, force);
+        case "END_USER_APPLICATION":
+            return endUserApplicationStore.getById(id, force);
+        default:
+            throw "Don't know how to load entity for kind: " + entityRef.kind;
+    }
+}
+
 export function loadByExtId(serviceBroker, kind, extId) {
     try {
         const remoteCall = determineLoadByExtIdCall(kind);
diff --git a/waltz-ng/client/common/selector-utils.js b/waltz-ng/client/common/selector-utils.js
index a9fb67fefe..0a7adda7f1 100644
--- a/waltz-ng/client/common/selector-utils.js
+++ b/waltz-ng/client/common/selector-utils.js
@@ -44,6 +44,7 @@ export function determineDownwardsScopeForKind(kind) {
         case "APPLICATION":
         case "APP_GROUP":
         case "CHANGE_INITIATIVE":
+        case "END_USER_APPLICATION":
         case "FLOW_DIAGRAM":
         case "LICENCE":
         case "LEGAL_ENTITY":
diff --git a/waltz-ng/client/common/svelte/ViewLink.svelte b/waltz-ng/client/common/svelte/ViewLink.svelte
index f3277db4b4..2c4f59e8c8 100644
--- a/waltz-ng/client/common/svelte/ViewLink.svelte
+++ b/waltz-ng/client/common/svelte/ViewLink.svelte
@@ -49,6 +49,10 @@
             path: ctx => `flow-diagram/${ctx.id}`,
             title: "Flow Diagram View"
         },
+        "main.end-user-application.view": {
+            path: ctx => `end-user-application/id/${ctx.id}`,
+            title: "End User Application View"
+        },
         "main.flow-classification-rule.view": {
             path: ctx => `flow-classification-rule/${ctx.id}`,
             title: "Flow Classification Rule View"
diff --git a/waltz-ng/client/common/svelte/info-panels/EntityInfoPanel.svelte b/waltz-ng/client/common/svelte/info-panels/EntityInfoPanel.svelte
index d540049fed..5ae60cd5d9 100644
--- a/waltz-ng/client/common/svelte/info-panels/EntityInfoPanel.svelte
+++ b/waltz-ng/client/common/svelte/info-panels/EntityInfoPanel.svelte
@@ -8,6 +8,7 @@
     import LogicalDataFlowPanel from "./LogicalDataFlowInfoPanel.svelte"
     import SurveyInstanceInfoPanel from "./SurveyInstanceInfoPanel.svelte";
     import PersonInfoPanel from "./PersonInfoPanel.svelte";
+    import EndUserApplicationInfoPanel from "./EndUserApplicationInfoPanel.svelte";
 
     export let primaryEntityRef;
 
@@ -21,6 +22,8 @@
                 return ChangeInitiativeInfoPanel;
             case "DATA_TYPE":
                 return DataTypeInfoPanel;
+            case "END_USER_APPLICATION":
+                return EndUserApplicationInfoPanel;
             case "LOGICAL_DATA_FLOW":
                 return LogicalDataFlowPanel;
             case "MEASURABLE":
diff --git a/waltz-ng/client/data-flow/components/svelte/FlowDecoratorExplorerPanel.svelte b/waltz-ng/client/data-flow/components/svelte/FlowDecoratorExplorerPanel.svelte
index 7307eb7602..a896e81a5d 100644
--- a/waltz-ng/client/data-flow/components/svelte/FlowDecoratorExplorerPanel.svelte
+++ b/waltz-ng/client/data-flow/components/svelte/FlowDecoratorExplorerPanel.svelte
@@ -38,16 +38,14 @@
     import Icon from "../../../common/svelte/Icon.svelte";
     import NoData from "../../../common/svelte/NoData.svelte";
     import {flowClassificationStore} from "../../../svelte-stores/flow-classification-store";
-    import {sameRef} from "../../../common/entity-utils";
+    import {loadSvelteEntity, sameRef} from "../../../common/entity-utils";
 
     export let primaryEntityRef;
 
     let flowGraphSummaryCall = logicalFlowStore.getFlowGraphSummary(primaryEntityRef, null);
     let flowClassificationCall = flowClassificationStore.findAll()
     let physicalFlowCall = physicalFlowStore.findBySelector(mkSelectionOptions(primaryEntityRef, "EXACT"));
-    let entityCall = primaryEntityRef.kind === 'APPLICATION'
-        ? applicationStore.getById(primaryEntityRef.id)
-        : actorStore.getById(primaryEntityRef.id);
+    let entityCall = loadSvelteEntity(primaryEntityRef);
 
     let breadcrumbs = [];
     let additionalBreadcrumbs = [];
@@ -75,8 +73,8 @@
     $: baseBreadcrumb = {
         id: -1,
         name: $flowDirection === flowDirections.INBOUND
-            ? `${$focusClient?.name || entity.name} Inbound flows`
-            : `${$focusClient?.name || entity.name} Outbound flows`,
+            ? `${$focusClient?.name || entity?.name} Inbound flows`
+            : `${$focusClient?.name || entity?.name} Outbound flows`,
         classes: "breadcrumb-root",
         onClick: () => {
             const parent = $focusClient || entity
@@ -87,7 +85,7 @@
 
     $: homeBreadcrumb = {
         id: -2,
-        name: `Home (${entity.name})`,
+        name: `Home (${entity?.name})`,
         classes: "breadcrumb-home",
         onClick: () => {
             $focusClient = null;
@@ -197,7 +195,7 @@
     }
 
 </script>
-
+{#if entity}
 <div class="row">
     <div class="col-md-12">
         <ol class="breadcrumb">
@@ -299,6 +297,7 @@
         </div>
     </div>
 </div>
+{/if}
 
 <style>
     svg {
diff --git a/waltz-ng/client/data-flow/components/svelte/flow-decorator-utils.js b/waltz-ng/client/data-flow/components/svelte/flow-decorator-utils.js
index 1029f55377..bab8bb65ef 100644
--- a/waltz-ng/client/data-flow/components/svelte/flow-decorator-utils.js
+++ b/waltz-ng/client/data-flow/components/svelte/flow-decorator-utils.js
@@ -8,6 +8,10 @@ const colors = {
     ACTOR: {
         fill: "#f0e9ff",
         stroke: "#9f75fd"
+    },
+    END_USER_APPLICATION: {
+        fill: "#fff0e9",
+        stroke: "#fd9575"
     }
 };
 
diff --git a/waltz-ng/client/flow-diagram/components/diagram-svelte/Node.svelte b/waltz-ng/client/flow-diagram/components/diagram-svelte/Node.svelte
index 7e99d4e5e2..3eb1f019fa 100644
--- a/waltz-ng/client/flow-diagram/components/diagram-svelte/Node.svelte
+++ b/waltz-ng/client/flow-diagram/components/diagram-svelte/Node.svelte
@@ -43,6 +43,7 @@
     const shapes = {
         ACTOR: (widthHint = 100) => Object.assign({}, mkTrapezoidShape(widthHint), {icon: "\uf2be"}, {svgIcon: getSymbol("user")}), // user-circle-o
         APPLICATION: (widthHint = 100) => Object.assign({}, mkRectShape(widthHint), {icon: "\uf108"}, {svgIcon: getSymbol("desktop")}),  // desktop
+        END_USER_APPLICATION: (widthHint = 100) => Object.assign({}, mkRectShape(widthHint), {icon: "\uf109"}), // laptop
         EUC: (widthHint = 100) => Object.assign({}, mkRectShape(widthHint), {icon: "\uf109"}), // laptop
         DEFAULT: (widthHint = 100) => Object.assign({}, mkRectShape(widthHint), {icon: "\uf096"})
     };
@@ -68,14 +69,14 @@
     $: associatedGroups = _.filter(groups, g => _.includes(g.data.applicationIds, node.data.id));
 
     $: classes = [
-        "wfd-node",
-        $overlay.appliedOverlay && !_.includes(associatedGroups, $overlay.appliedOverlay)
-            ? "wfd-not-active"
-            : "wfd-active",
-        $selectedNode && toGraphId($selectedNode) === node.id
-            ? 'wfd-selected-node'
-            : ''
-    ].join(" ");
+            "wfd-node",
+            $overlay.appliedOverlay && !_.includes(associatedGroups, $overlay.appliedOverlay)
+                ? "wfd-not-active"
+                : "wfd-active",
+            $selectedNode && toGraphId($selectedNode) === node.id
+                ? 'wfd-selected-node'
+                : '']
+        .join(" ");
 
     $: nodeStyling = determineStylingBasedUponLifecycle(node.data.entityLifecycleStatus);
 
diff --git a/waltz-ng/client/flow-diagram/components/diagram-svelte/context-panel/AnnotationPanel.svelte b/waltz-ng/client/flow-diagram/components/diagram-svelte/context-panel/AnnotationPanel.svelte
index 6e767f1b3e..02fd42b102 100644
--- a/waltz-ng/client/flow-diagram/components/diagram-svelte/context-panel/AnnotationPanel.svelte
+++ b/waltz-ng/client/flow-diagram/components/diagram-svelte/context-panel/AnnotationPanel.svelte
@@ -25,7 +25,7 @@
         cancel();
     }
 
-    const nodeKinds = ["APPLICATION", "ACTOR"];
+    const nodeKinds = ["APPLICATION", "ACTOR", "END_USER_APPLICATION"];
 
 
     $: isNode = _.includes(nodeKinds, selected.entityReference.kind);
diff --git a/waltz-ng/client/flow-diagram/components/diagram-svelte/context-panel/NodePanel.svelte b/waltz-ng/client/flow-diagram/components/diagram-svelte/context-panel/NodePanel.svelte
index fd926257b3..4318454944 100644
--- a/waltz-ng/client/flow-diagram/components/diagram-svelte/context-panel/NodePanel.svelte
+++ b/waltz-ng/client/flow-diagram/components/diagram-svelte/context-panel/NodePanel.svelte
@@ -3,22 +3,17 @@
     import {Directions} from "./panel-utils";
     import {createEventDispatcher} from "svelte";
     import {toGraphId} from "../../../flow-diagram-utils";
-    import {applicationStore} from "../../../../svelte-stores/application-store";
-    import {actorStore} from "../../../../svelte-stores/actor-store";
     import EntityLink from "../../../../common/svelte/EntityLink.svelte";
     import AddAnnotationSubPanel from "./AddAnnotationSubPanel.svelte";
     import model from "../store/model";
     import Icon from "../../../../common/svelte/Icon.svelte";
+    import {loadSvelteEntity} from "../../../../common/entity-utils";
 
     export let selected;
     export let canEdit;
     const dispatch = createEventDispatcher();
 
-    $: isApp = selected.kind === 'APPLICATION';
-
-    $: nodeCall = (isApp)
-        ? applicationStore.getById(selected.id)
-        : actorStore.getById(selected.id);
+    $: nodeCall = selected && loadSvelteEntity(selected);
 
     $: node = $nodeCall.data;
 
@@ -50,7 +45,7 @@
     </strong>
 </div>
 <br>
-{#if activeMode === Modes.VIEW}
+{#if activeMode === Modes.VIEW && node}
     <div class="help-block">
         <p>{node.assetCode || node.externalId || "No external identifier"}</p>
         {node.description}
diff --git a/waltz-ng/client/flow-diagram/flow-diagram-utils.js b/waltz-ng/client/flow-diagram/flow-diagram-utils.js
index 91cdb067cc..be05cdde3f 100644
--- a/waltz-ng/client/flow-diagram/flow-diagram-utils.js
+++ b/waltz-ng/client/flow-diagram/flow-diagram-utils.js
@@ -24,6 +24,7 @@ export function determineIfCreateAllowed(kind) {
         case "APPLICATION":
         case "CHANGE_INITIATIVE":
         case "DATA_TYPE":
+        case "END_USER_APPLICATION":
         case "LOGICAL_DATA_FLOW":
         case "MEASURABLE":
         case "PHYSICAL_FLOW":
@@ -67,40 +68,3 @@ export function shapeFor(ref) {
             return {cx: 50, cy: 5};
     }
 }
-
-
-// -- shapes
-
-function mkTrapezoidShape(widthHint) {
-    return {
-        path: `M0,0 L${widthHint},0 L${widthHint - 5},20 L5,20 z`,
-        cx: widthHint / 2,
-        cy: 10,
-        title: {
-            dx: 8,
-            dy: 13
-        }
-    };
-}
-
-
-function mkRectShape(widthHint) {
-    const shape = {
-        path: `M0,0 L${widthHint},0 L${widthHint},20 L0,20 z`,
-        cx: widthHint / 2,
-        cy: 10,
-        title: {
-            dx: 4,
-            dy: 13
-        }
-    };
-    return shape
-}
-
-
-const shapes = {
-    ACTOR: (widthHint = 100) => Object.assign({}, mkTrapezoidShape(widthHint), { icon: "\uf2be"}), // user-circle-o
-    APPLICATION: (widthHint = 100) => Object.assign({}, mkRectShape(widthHint), { icon: "\uf108" }),  // desktop
-    EUC: (widthHint = 100) => Object.assign({}, mkRectShape(widthHint), { icon: "\uf109" }), // laptop
-    DEFAULT: (widthHint = 100) => Object.assign({}, mkRectShape(widthHint), { icon: "\uf096" })
-};
diff --git a/waltz-ng/client/flow-diagram/services/flow-diagram-state-service.js b/waltz-ng/client/flow-diagram/services/flow-diagram-state-service.js
index 195704eb90..45ee8c25ec 100644
--- a/waltz-ng/client/flow-diagram/services/flow-diagram-state-service.js
+++ b/waltz-ng/client/flow-diagram/services/flow-diagram-state-service.js
@@ -40,7 +40,7 @@ function restoreDiagram(
 
     // nodes
     _.chain(entityNodes)
-        .filter(ent => _.includes(["APPLICATION", "ACTOR"], ent.entityReference.kind))
+        .filter(ent => _.includes(["APPLICATION", "ACTOR", "END_USER_APPLICATION"], ent.entityReference.kind))
         .forEach(ent => newModel.addNode(toGraphNode(ent.entityReference)))
         .value();
 
diff --git a/waltz-service/src/main/java/org/finos/waltz/service/data_type/DataTypeDecoratorService.java b/waltz-service/src/main/java/org/finos/waltz/service/data_type/DataTypeDecoratorService.java
index 1a571ff9b0..340922afa0 100644
--- a/waltz-service/src/main/java/org/finos/waltz/service/data_type/DataTypeDecoratorService.java
+++ b/waltz-service/src/main/java/org/finos/waltz/service/data_type/DataTypeDecoratorService.java
@@ -18,6 +18,7 @@
 
 package org.finos.waltz.service.data_type;
 
+import org.finos.waltz.data.GenericSelector;
 import org.finos.waltz.data.GenericSelectorFactory;
 import org.finos.waltz.data.datatype_decorator.DataTypeDecoratorDao;
 import org.finos.waltz.data.datatype_decorator.DataTypeDecoratorDaoSelectorFactory;
@@ -75,7 +76,6 @@
 import static org.finos.waltz.common.ListUtilities.newArrayList;
 import static org.finos.waltz.common.SetUtilities.filter;
 import static org.finos.waltz.common.SetUtilities.map;
-import static org.finos.waltz.model.EntityKind.ACTOR;
 import static org.finos.waltz.model.EntityKind.APPLICATION;
 import static org.finos.waltz.model.EntityKind.DATA_TYPE;
 import static org.finos.waltz.model.EntityKind.LOGICAL_DATA_FLOW;
@@ -291,12 +291,15 @@ private Collection<DataTypeDecorator> getSelectorForLogicalFlow(DataTypeDecorato
             case MEASURABLE:
             case SCENARIO:
             case CHANGE_INITIATIVE:
-                return dao.findByAppIdSelector(
-                        genericSelectorFactory.applyForKind(APPLICATION, options).selector());
+                GenericSelector genericSelector = genericSelectorFactory.applyForKind(APPLICATION, options);
+                return dao.findByEntityIdSelector(
+                        genericSelector.selector(),
+                        Optional.of(genericSelector.kind()));
             case ACTOR:
+            case END_USER_APPLICATION:
                 return dao.findByEntityIdSelector(
                         DSL.select(DSL.val(options.entityReference().id())),
-                        Optional.of(ACTOR));
+                        Optional.of(options.entityReference().kind()));
             case DATA_TYPE:
                 return dao.findByDataTypeIdSelector(
                         genericSelectorFactory.applyForKind(DATA_TYPE, options).selector());
diff --git a/waltz-service/src/main/java/org/finos/waltz/service/flow_classification_rule/FlowClassificationRuleService.java b/waltz-service/src/main/java/org/finos/waltz/service/flow_classification_rule/FlowClassificationRuleService.java
index 4d345b5e8f..80a9e91df1 100644
--- a/waltz-service/src/main/java/org/finos/waltz/service/flow_classification_rule/FlowClassificationRuleService.java
+++ b/waltz-service/src/main/java/org/finos/waltz/service/flow_classification_rule/FlowClassificationRuleService.java
@@ -446,6 +446,7 @@ public Set<FlowClassificationRule> findClassificationRules(IdSelectionOptions op
                 break;
             case APPLICATION:
             case ACTOR:
+            case END_USER_APPLICATION:
                 customSelectionCriteria = Tables.FLOW_CLASSIFICATION_RULE.SUBJECT_ENTITY_KIND.eq(options.entityReference().kind().name())
                         .and(Tables.FLOW_CLASSIFICATION_RULE.SUBJECT_ENTITY_ID.eq(options.entityReference().id()))
                         .and(FlowClassificationRuleDao.SUPPLIER_APP.KIND.notIn(options.filters().omitApplicationKinds()));
diff --git a/waltz-service/src/main/java/org/finos/waltz/service/flow_diagram/FlowDiagramService.java b/waltz-service/src/main/java/org/finos/waltz/service/flow_diagram/FlowDiagramService.java
index 098ed561fb..afcb7eda8a 100644
--- a/waltz-service/src/main/java/org/finos/waltz/service/flow_diagram/FlowDiagramService.java
+++ b/waltz-service/src/main/java/org/finos/waltz/service/flow_diagram/FlowDiagramService.java
@@ -18,6 +18,8 @@
 
 package org.finos.waltz.service.flow_diagram;
 
+import org.finos.waltz.data.end_user_app.EndUserAppDao;
+import org.finos.waltz.model.enduserapp.EndUserApplication;
 import org.finos.waltz.service.changelog.ChangeLogService;
 import org.finos.waltz.service.data_type.DataTypeService;
 import org.finos.waltz.common.DateTimeUtilities;
@@ -86,6 +88,7 @@ public class FlowDiagramService {
     private final PhysicalFlowDao physicalFlowDao;
     private final PhysicalSpecificationDao physicalSpecificationDao;
     private final ActorDao actorDao;
+    private final EndUserAppDao endUserAppDao;
     private final Random rnd = RandomUtilities.getRandom();
     private final FlowDiagramIdSelectorFactory flowDiagramIdSelectorFactory = new FlowDiagramIdSelectorFactory();
     private final LogicalFlowIdSelectorFactory logicalFlowIdSelectorFactory = new LogicalFlowIdSelectorFactory();
@@ -105,6 +108,7 @@ public FlowDiagramService(ChangeLogService changeLogService,
                               PhysicalFlowDao physicalFlowDao,
                               PhysicalSpecificationDao physicalSpecificationDao,
                               ActorDao actorDao,
+                              EndUserAppDao endUserAppDao,
                               MeasurableDao measurableDao,
                               ChangeInitiativeDao changeInitiativeDao) {
         checkNotNull(changeLogService, "changeLogService cannot be null");
@@ -118,6 +122,7 @@ public FlowDiagramService(ChangeLogService changeLogService,
         checkNotNull(physicalFlowDao, "physicalFlowDao cannot be null");
         checkNotNull(physicalSpecificationDao, "physicalSpecificationDao cannot be null");
         checkNotNull(actorDao, "actorDao cannot be null");
+        checkNotNull(endUserAppDao, "endUserAppDao cannot be null");
         checkNotNull(measurableDao, "measurableDao cannot be null");
         checkNotNull(changeInitiativeDao, "changeInitiativeDao cannot be null");
 
@@ -133,6 +138,7 @@ public FlowDiagramService(ChangeLogService changeLogService,
         this.physicalFlowDao = physicalFlowDao;
         this.physicalSpecificationDao = physicalSpecificationDao;
         this.actorDao = actorDao;
+        this.endUserAppDao = endUserAppDao;
         this.measurableDao = measurableDao;
         this.changeInitiativeDao = changeInitiativeDao;
     }
@@ -324,6 +330,8 @@ public Long makeNewDiagramForEntity(EntityReference ref, String userId, String t
                 return makeForApplication(ref, userId, title);
             case ACTOR:
                 return makeForActor(ref, userId, title);
+            case END_USER_APPLICATION:
+                return makeForEndUserApplication(ref, userId, title);
             case LOGICAL_DATA_FLOW:
                 return makeForLogicalFlow(ref, userId, title);
             case PHYSICAL_FLOW:
@@ -341,6 +349,25 @@ public Long makeNewDiagramForEntity(EntityReference ref, String userId, String t
         }
     }
 
+
+    private Long makeForEndUserApplication(EntityReference ref,
+                                           String userId,
+                                           String providedTitle) {
+
+        EndUserApplication endUserApp = endUserAppDao.getById(ref.id());
+
+        String title = isEmpty(providedTitle)
+                ? endUserApp.name() + " flows"
+                : providedTitle;
+
+        ArrayList<FlowDiagramEntity> entities = newArrayList(mkDiagramEntity(endUserApp));
+        ArrayList<FlowDiagramAnnotation> annotations = newArrayList(mkDiagramAnnotation(endUserApp.entityReference(), title));
+
+        return mkNewFlowDiagram(title, userId, entities, annotations);
+
+    }
+
+
     private Long makeForLogicalFlow(EntityReference ref, String userId, String providedTitle) {
         LogicalFlow logicalFlow = logicalFlowDao.getByFlowId(ref.id());
 
@@ -468,7 +495,8 @@ private String mkLayoutData(List<FlowDiagramEntity> entities,
         String entityPositionTemplate = "\"%s/%s\": { \"x\": %d, \"y\": %d }";
         Set<EntityKind> positionableEntityKinds = SetUtilities.fromArray(
                 EntityKind.APPLICATION,
-                EntityKind.ACTOR);
+                EntityKind.ACTOR,
+                EntityKind.END_USER_APPLICATION);
 
         Stream<String> entityPositions = entities
                 .stream()
diff --git a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LogicalFlowExtractor.java b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LogicalFlowExtractor.java
index 8f329659f7..f05e88430c 100644
--- a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LogicalFlowExtractor.java
+++ b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/LogicalFlowExtractor.java
@@ -61,22 +61,22 @@ public class LogicalFlowExtractor extends CustomDataExtractor {
     private static final Field<String> SOURCE_NAME_FIELD = mkNameField(
             LOGICAL_FLOW.SOURCE_ENTITY_ID,
             LOGICAL_FLOW.SOURCE_ENTITY_KIND,
-            newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR));
+            newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR, EntityKind.END_USER_APPLICATION));
 
     private static final Field<String> TARGET_NAME_FIELD = mkNameField(
             LOGICAL_FLOW.TARGET_ENTITY_ID,
             LOGICAL_FLOW.TARGET_ENTITY_KIND,
-            newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR));
+            newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR, EntityKind.END_USER_APPLICATION));
 
     private static final Field<String> SOURCE_EXT_ID_FIELD = mkExternalIdField(
             LOGICAL_FLOW.SOURCE_ENTITY_ID,
             LOGICAL_FLOW.SOURCE_ENTITY_KIND,
-            newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR));
+            newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR, EntityKind.END_USER_APPLICATION));
 
     private static final Field<String> TARGET_EXT_ID_FIELD = mkExternalIdField(
             LOGICAL_FLOW.TARGET_ENTITY_ID,
             LOGICAL_FLOW.TARGET_ENTITY_KIND,
-            newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR));
+            newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR, EntityKind.END_USER_APPLICATION));
 
     private static List<String> staticHeaders = newArrayList(
             "Source",
diff --git a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/PhysicalFlowExtractor.java b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/PhysicalFlowExtractor.java
index 56de332810..8ec918c23a 100644
--- a/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/PhysicalFlowExtractor.java
+++ b/waltz-web/src/main/java/org/finos/waltz/web/endpoints/extracts/PhysicalFlowExtractor.java
@@ -36,7 +36,6 @@
 import org.jooq.Result;
 import org.jooq.Select;
 import org.jooq.SelectConditionStep;
-import org.jooq.impl.DSL;
 import org.jooq.lambda.tuple.Tuple3;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -55,7 +54,6 @@
 import static org.finos.waltz.schema.Tables.PHYSICAL_FLOW;
 import static org.finos.waltz.schema.Tables.TAG;
 import static org.finos.waltz.schema.Tables.TAG_USAGE;
-import static org.finos.waltz.schema.tables.Application.APPLICATION;
 import static org.finos.waltz.schema.tables.LogicalFlow.LOGICAL_FLOW;
 import static org.finos.waltz.schema.tables.PhysicalSpecification.PHYSICAL_SPECIFICATION;
 import static spark.Spark.post;
@@ -77,13 +75,12 @@ public class PhysicalFlowExtractor extends CustomDataExtractor {
         Field<String> SOURCE_NAME_FIELD = InlineSelectFieldFactory.mkNameField(
                 LOGICAL_FLOW.SOURCE_ENTITY_ID,
                 LOGICAL_FLOW.SOURCE_ENTITY_KIND,
-                newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR));
+                newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR, EntityKind.END_USER_APPLICATION));
 
-        Field<String> sourceAssetCodeField = DSL
-                .when(LOGICAL_FLOW.SOURCE_ENTITY_KIND.eq(EntityKind.APPLICATION.name()),
-                        DSL.select(APPLICATION.ASSET_CODE)
-                                .from(APPLICATION)
-                                .where(APPLICATION.ID.eq(LOGICAL_FLOW.SOURCE_ENTITY_ID)));
+        Field<String> sourceAssetCodeField = InlineSelectFieldFactory.mkExternalIdField(
+                LOGICAL_FLOW.SOURCE_ENTITY_ID,
+                LOGICAL_FLOW.SOURCE_ENTITY_KIND,
+                newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR, EntityKind.END_USER_APPLICATION));
 
         SOURCE_NAME_AND_ASSET_CODE_FIELDS = ListUtilities.asList(
                 SOURCE_NAME_FIELD.as("Source"),
@@ -92,13 +89,12 @@ public class PhysicalFlowExtractor extends CustomDataExtractor {
         Field<String> TARGET_NAME_FIELD = InlineSelectFieldFactory.mkNameField(
                 LOGICAL_FLOW.TARGET_ENTITY_ID,
                 LOGICAL_FLOW.TARGET_ENTITY_KIND,
-                newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR));
+                newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR, EntityKind.END_USER_APPLICATION));
 
-        Field<String> targetAssetCodeField = DSL
-                .when(LOGICAL_FLOW.TARGET_ENTITY_KIND.eq(EntityKind.APPLICATION.name()),
-                        DSL.select(APPLICATION.ASSET_CODE)
-                                .from(APPLICATION)
-                                .where(APPLICATION.ID.eq(LOGICAL_FLOW.TARGET_ENTITY_ID)));
+        Field<String> targetAssetCodeField = InlineSelectFieldFactory.mkExternalIdField(
+                LOGICAL_FLOW.TARGET_ENTITY_ID,
+                LOGICAL_FLOW.TARGET_ENTITY_KIND,
+                newArrayList(EntityKind.APPLICATION, EntityKind.ACTOR, EntityKind.END_USER_APPLICATION));
 
         RECEIVER_NAME_AND_ASSET_CODE_FIELDS = ListUtilities.asList(
                 TARGET_NAME_FIELD.as("Receiver"),