diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..26d33521af10bcc7fd8cea344038eaaeb78d0ef5
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4d5a22ee33694e1c6d7c156cb7c56c9ff7aa60fd
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="adopt-openj9-1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000000000000000000000000000000000000..943eb45e9d9d59fdea414b28c714023c7da18de9
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/fdp-pillar.iml" filepath="$PROJECT_DIR$/fdp-pillar.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000000000000000000000000000000000000..35eb1ddfbbc029bcab630581847471d7f238ec53
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/blazegraph.yaml b/blazegraph.yaml
index a3e05b89e78dea4250f52902f3190bf28202544d..b6a67f6a0b4feacd5c29a59b46453d402b8a3dca 100644
--- a/blazegraph.yaml
+++ b/blazegraph.yaml
@@ -1,13 +1,14 @@
 apiVersion: v1
 kind: Service
 metadata:
+  name: blazegraph
   labels:
     app: fdp
     tier: blazegrah
-  name: blazegraph
-spec:
+spec: 
+  type: LoadBalancer
   ports:
-  - name: "8888"
+  - protocol: TCP
     port: 8888
     targetPort: 8080
   selector:
diff --git a/elasticsearch.yaml b/elasticsearch.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d722d48f31df80dc09e88a2e9cabc5807f0f5f7b
--- /dev/null
+++ b/elasticsearch.yaml
@@ -0,0 +1,151 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: elasticsearch-cluster
+  labels:
+    app: fdp
+    tier: elasticsearch
+spec:
+  selector:
+    app: fdp
+    tier: elasticsearch
+  ports:
+  - name: transport
+    port: 9300
+    targetPort: 9300
+    
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: fdp
+    tier: elasticsearch
+  name: elasticsearch-loadbalancer
+spec:
+  selector:
+    app: fdp
+    tier: elasticsearch
+  ports:
+  - name: http
+    port: 9200
+    targetPort: 9200
+
+
+---
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    app: fdp
+    tier: elasticsearch
+  name: es-config
+data:
+  config_env: |
+    cluster.name: docker-cluster    
+    network.host: "0.0.0.0"
+    bootstrap.memory_lock: true
+    discovery.type=single-node
+    xpack.security.enabled: false
+    xpack.monitoring.enabled: false
+  ES_JAVA_OPTS: -Xms512m -Xmx512m
+
+---
+
+
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  labels:
+    app: fdp
+    tier: elasticsearch
+  name: elasticsearch-claim0
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+
+---
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: fdp
+    tier: elasticsearch
+  name: esnode
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: fdp
+      tier: elasticsearch
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        app: fdp
+        tier: elasticsearch    
+    spec:
+      securityContext:
+        fsGroup: 1000
+      initContainers:
+      - name: init-sysctl
+        image: busybox
+        imagePullPolicy: IfNotPresent
+        securityContext:
+          privileged: true
+        command: ["sysctl", "-w", "vm.max_map_count=262144"]
+      containers:
+      - name: elasticsearch
+        resources:
+            requests:
+                memory: 100Mi      
+        securityContext:
+          privileged: true
+          runAsUser: 1000
+          capabilities:
+            add:
+            - IPC_LOCK
+            - SYS_RESOURCE
+        image: docker.elastic.co/elasticsearch/elasticsearch:7.7.0
+        env:
+        - name: ES_JAVA_OPTS
+          valueFrom:
+              configMapKeyRef:
+                  name: es-config
+                  key: ES_JAVA_OPTS
+        - name: config_env
+          valueFrom:
+              configMapKeyRef:
+                  name: es-config
+                  key: config_env
+        readinessProbe:
+          httpGet:
+            scheme: HTTP
+            path: /_cluster/health?local=true
+            port: 9200
+          initialDelaySeconds: 5
+        ports:
+        - containerPort: 9200
+          name: es-http
+        - containerPort: 9300
+          name: es-transport
+        volumeMounts:
+          - mountPath: /usr/share/elasticsearch/data
+            name: elasticsearch-claim0
+      restartPolicy: Always
+      serviceAccountName: ""
+      volumes:
+        - name: elasticsearch-claim0
+          persistentVolumeClaim:
+            claimName: elasticsearch-claim0
+                      
+
+
+          
diff --git a/fdp-client.yaml b/fdp-client.yaml
index 922b745661c8068b5038de6d19de493306abdcc7..8299520debf9d188b77b53490895343a09efd577 100644
--- a/fdp-client.yaml
+++ b/fdp-client.yaml
@@ -14,6 +14,7 @@ spec:
   selector:
     app: fdp
     tier: front
+    
 ---
 
 apiVersion: apps/v1
diff --git a/nohup.out b/nohup.out
index fd4f1092737cb8077a1f4e13375d48b2da50405e..959f03c5eda1c55eaf62acf6a13aca4d224fe533 100644
--- a/nohup.out
+++ b/nohup.out
@@ -1,4 +1,8 @@
 * Verifying dashboard health ...
 * Launching proxy ...
 * Verifying proxy health ...
-* Opening http://127.0.0.1:46363/api/v1/namespaces/kubernetes-dashboard/services/http:kubernetes-dashboard:/proxy/ in your default browser...
+* Opening http://127.0.0.1:33713/api/v1/namespaces/kubernetes-dashboard/services/http:kubernetes-dashboard:/proxy/ in your default browser...
+* Verifying dashboard health ...
+* Launching proxy ...
+* Verifying proxy health ...
+* Opening http://127.0.0.1:43467/api/v1/namespaces/kubernetes-dashboard/services/http:kubernetes-dashboard:/proxy/ in your default browser...
diff --git a/smartapi.yaml b/smartapi.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a353e39157005d637e170130da4307ea90d9e90a
--- /dev/null
+++ b/smartapi.yaml
@@ -0,0 +1,47 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: fdp
+    tier: smartapi
+  name: smartapi
+spec:
+  type: LoadBalancer
+  ports:
+  - name: "8000"
+    port: 8000
+    targetPort: 8000
+  selector:
+    app: fdp
+    tier: smartapi
+
+
+---
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: fdp
+    tier: smartapi
+  name: smartapi
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: fdp
+      tier: smartapi
+  template:
+    metadata:
+      annotations:
+      labels:
+        app: fdp
+        tier: smartapi
+    spec:
+      containers:
+        - image: cines/smartapi:v1.2
+          name: smartapi
+          ports:
+            - containerPort: 8000
+      restartPolicy: Always
+