diff --git a/Client/src/App.vue b/Client/src/App.vue
index 9bfd62b..d6591a7 100644
--- a/Client/src/App.vue
+++ b/Client/src/App.vue
@@ -176,7 +176,7 @@ export default {
         this.baseMenu = this.caMenu;
       }
       if(to.fullPath === "/") this.$router.push({name: "splash"});
-      if (to.name === 'newPeer' || to.name === 'joinChannel' || to.name === 'chaincode') this.updateMenuAndTab(MENU_TYPES.PEER);
+      if (to.name === 'newPeer' || to.name === 'joinChannel' || to.name === 'chaincode' || to.name === 'peerOperations') this.updateMenuAndTab(MENU_TYPES.PEER);
       if (to.name === 'caInput' && this.showTopBarItems) this.updateMenuAndTab(MENU_TYPES.CA);
     }
   },
diff --git a/Client/src/components/JoinChannelDialog.vue b/Client/src/components/JoinChannelDialog.vue
new file mode 100644
index 0000000..eb235b3
--- /dev/null
+++ b/Client/src/components/JoinChannelDialog.vue
@@ -0,0 +1,89 @@
+<template>
+  <Dialog v-model:visible="display" @hide="onHide" style="width: 80%">
+    <template #header>Yeni Kanala Katıl</template>
+    <div class="p-grid">
+      <div class="p-col-6">
+        <h6 class="p-text-left">Yeni Kanal Adı</h6>
+        <div class="p-inputgroup">
+          <InputText v-model="newChannelName" placeholder="Yeni Kanal Adı"/>
+        </div>
+      </div>
+
+      <div class="p-col-6" >
+        <h6 class="p-text-left">Orderer Bilgleri</h6>
+        <div class="p-col padding-zero p-inputgroup">
+          <div class="p-col padding-left-zero p-inputgroup">
+            <InputText v-model="ordererAddress" placeholder="Orderer Adresi"/>
+          </div>
+          <div class="p-col padding-left-zero p-inputgroup">
+            <InputText v-model="ordererOrgName" placeholder="Orderder Org Adı"/>
+          </div>
+        </div>
+      </div>
+
+      <div class="p-col-9">
+      </div>
+      <div class="p-col-3 p-align-end">
+        <Button label="Kanala Katıl" class="p-col-12" @click="onClick"></Button>
+      </div>
+    </div>
+  </Dialog>
+</template>
+
+<script>
+import EventService from "@/service/EventService";
+import {EVENTS} from "@/utilities/Utils";
+
+const SUMMARY = "Kanal İşlemleri";
+
+export default {
+  name: "JoinChannelDialog",
+  emits: [EVENTS.SHOW_PROGRESS_BAR, EVENTS.SHOW_TOAST, "close-dialog"],
+  props: ["visible"],
+  created() {
+    this.eventService = new EventService(this, SUMMARY);
+  },
+  methods: {
+    onHide() {
+      // do work here
+      this.$emit('close-dialog', {});
+    },
+    onClick() {
+      this.$emit('close-dialog', {
+        channelConfig: {
+          ordererConfig: {
+            ordererAddress: this.ordererAddress,
+            ordererOrgName: this.ordererOrgName
+          },
+          channelName: this.newChannelName
+        }
+      });
+    }
+  },
+  data() {
+    return {
+      display: false,
+      newChannelName: '',
+      ordererAddress: '',
+      ordererOrgName: '',
+      eventService: null
+    }
+  },
+  watch: {
+    visible: function (newValue) {
+      this.display = newValue;
+    }
+  }
+}
+</script>
+
+<style scoped>
+.padding-left-zero {
+  padding-left: 0 !important;
+  padding-top: 0 !important;
+}
+
+.padding-zero {
+  padding: 0 !important;
+}
+</style>
\ No newline at end of file
diff --git a/Client/src/components/NewPeerDialog.vue b/Client/src/components/NewPeerDialog.vue
new file mode 100644
index 0000000..2e65731
--- /dev/null
+++ b/Client/src/components/NewPeerDialog.vue
@@ -0,0 +1,104 @@
+<template>
+  <Dialog v-model:visible="display" @hide="onHide" style="width: 80%">
+    <template #header>
+      Peer Bilgileri
+    </template>
+    <div class="p-grid p-pb-2">
+      <div class="p-col-6">
+        <h6 class="p-text-left">Peer Adı<span style="color:red;"> *</span></h6>
+        <div class="p-inputgroup">
+          <InputText v-model="peerName" placeholder="Kullanıcı adı girin"/>
+        </div>
+      </div>
+
+      <div class="p-col-6">
+        <h6 class="p-text-left">Peer Şifre <span style="color:red;"> *</span></h6>
+        <div class="p-inputgroup">
+          <InputText v-model="password" placeholder="Şifre girin"/>
+        </div>
+      </div>
+
+      <div class="p-col-6">
+        <h6 class="p-text-left">Host Adresleri<span style="color:red;"> *</span></h6>
+        <div class="p-inputgroup">
+          <InputText v-model="csrHosts" placeholder="eg. 172.20.20.82,*.Org1.com,..."/>
+        </div>
+      </div>
+
+      <div class="p-col-6">
+        <h6 class="p-text-left">Port<span style="color:red;"> *</span></h6>
+        <div class="p-inputgroup">
+          <InputText v-model="port" placeholder="eg. 7052"/>
+        </div>
+      </div>
+      <div class="p-col-12 p-text-left" style="color: red; font-size: 0.75em">* ile işaretlenen alanlar CA sunucusunun
+        oluşturulabilmesi için zorunludur
+      </div>
+      <div class="p-col-9">
+      </div>
+
+      <div class="p-col-3">
+        <Button label="Düğüm Oluştur" class="p-col-12" @click="onClick"></Button>
+      </div>
+    </div>
+  </Dialog>
+</template>
+
+<script>
+import EventService from "../service/EventService";
+import {EVENTS, INIT_ITEMS} from "@/utilities/Utils";
+
+const SUMMARY = 'Yeni Düğüm';
+export default {
+  name: "NewPeerDialog",
+  props: ['visible'],
+  emits: [EVENTS.SHOW_PROGRESS_BAR, EVENTS.SHOW_TOAST, "close-cc", "close-dialog"],
+  created() {
+    this.eventService = new EventService(this, SUMMARY);
+    this.clear();
+  },
+  methods: {
+    onHide() {
+      this.$emit('close-dialog', {});
+    },
+    onClick() {
+      this.$emit('close-dialog', {
+        newPeerConfig: {
+          peerName: this.peerName,
+          password: this.password,
+          orgName: this.orgName,
+          port: this.port,
+          csrHosts: this.csrHosts
+        }
+      });
+    },
+    clear() {
+      this.peerName = '';
+      this.password = '';
+      this.csrHosts = '';
+      this.port = '';
+      this.isDisabled = false;
+    }
+  },
+  data() {
+    return {
+      display: false,
+      peerName: '',
+      password: '',
+      orgName: localStorage.getItem(INIT_ITEMS.ORG_NAME),
+      port: '',
+      csrHosts: '',
+      eventService: null
+    }
+  },
+  watch: {
+    visible: function (newValue) {
+      this.display = newValue;
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/Client/src/components/PeerOperations.vue b/Client/src/components/PeerOperations.vue
index 470130d..8604a53 100644
--- a/Client/src/components/PeerOperations.vue
+++ b/Client/src/components/PeerOperations.vue
@@ -1,69 +1,195 @@
 <template>
-<div class="p-grid p-pb-6">
-  <div class="p-col-12 p-text-center">
-    <div class="p-toolbar">
-      <div class="p-tooltip-left">
-        <h4 class="p-d-inline">Organizasyonda Tanımlı Düğümler</h4>
+  <div>
+    <NewPeerDialog :visible="showNewPeerDialog" @close-dialog="onNewPeerDialogClosed"/>
+    <JoinChannelDialog :visible="showNewChannelDialog" @close-dialog="onNewChannelDialogClosed"/>
+    <div class="p-grid p-pb-6">
+      <div class="p-col-12 p-text-center">
+        <div class="p-toolbar background-white">
+          <div class="p-tooltip-left">
+            <h4 class="p-d-inline">Organizasyonda Tanımlı Düğümler</h4>
+          </div>
+          <Button icon="pi pi-plus" iconPos="right" label="Yeni Düğüm" @click="onNewPeerClick"></Button>
+          <DataTable :value="peers" class="border p-mt-4" v-model:selection="selectedPeer" selectionMode="single"
+                     data-key="peerName">
+            <Column field="peerName" header="Düğüm Adı"></Column>
+            <Column field="port" header="Port"></Column>
+            <Column field="host" header="Host Adresi"></Column>
+          </DataTable>
+        </div>
       </div>
-      <Button icon="pi pi-plus" iconPos="right" label="Yeni Düğüm"></Button>
-      <DataTable :value="peers" class="border p-mt-4" v-model:selection="selectedPeer" selectionMode="single" data-key="peerName">
-        <Column field="peerName" header="Düğüm Adı"></Column>
-        <Column field="port" header="Port"></Column>
-        <Column field="host" header="Host Adresi"></Column>
-      </DataTable>
-    </div>
-  </div>
-  <div class="p-col-12">
-    <div class="p-card p-grid p-m-0  p-text-center p-col">
-      <h4 class="p-col-12">Kanallar</h4>
-      <div class="p-col-9 p-m-0">
-        <h6 class="p-text-left p-mt-2 p-text-bold">Peer1'in Katıldığı Kanallar</h6>
-      </div>
-      <div class="p-col-3 p-m-0">
-        <Button class="p-align-end" icon="pi pi-plus" iconPos="right" label="Yeni Kanala Katıl"></Button>
+      <div class="p-col-12" v-show="showDetails">
+        <div class="p-card p-grid p-m-0  p-text-center p-col">
+          <h4 class="p-col-12">Kanallar</h4>
+          <div class="p-col-9">
+            <h6 class="p-text-left p-mt-2 p-text-bold" v-text="channelsTitle()"></h6>
+          </div>
+          <div class="p-col-3 p-text-right">
+            <Button class="p-text-right" icon="pi pi-plus" iconPos="right" label="Yeni Kanala Katıl"
+                    @click="showNewChannelDialog=true"></Button>
+          </div>
+          <DataTable :value="channels" class="border p-mt-2 p-mb-6" v-model:selection="selectedChannel"
+                     selectionMode="single"
+                     data-key="channelName">
+            <Column field="label" header="Kanal Adı"></Column>
+          </DataTable>
+          <div class="p-grid p-m-0" v-show="showChaincodeDetails">
+            <div class="p-col-9">
+              <h6 class="p-text-left p-mt-2 p-text-bold">Kanal 2 Yüklü Akıllı Kontratlar</h6>
+            </div>
+            <div class="p-col-3 p-text-right p-m-0">
+              <Button icon="pi pi-plus" iconPos="right" label="Yeni Akıllı Kontrat Yükle"></Button>
+            </div>
+            <DataTable :value="chaincodes" class="border p-mt-2">
+              <Column field="name" header="Akıllı Kontrat Adı"></Column>
+              <Column field="version" header="Versiyonu"></Column>
+              <Column field="sequence" header="Sekans No"></Column>
+              <Column field="state" header="Durumu"></Column>
+            </DataTable>
+          </div>
+        </div>
       </div>
-      <DataTable :value="channels" class="border p-mt-2 p-mb-6" v-model:selection="selectedCC" selectionMode="single" data-key="channelName">
-        <Column field="channelName" header="Kanal Adı"></Column>
-      </DataTable>
-      <div class="p-col-9 p-m-0">
-        <h6 class="p-text-left p-mt-2 p-text-bold">Kanal 2 Yüklü Akıllı Kontratlar</h6>
-      </div>
-      <div class="p-col-3 p-m-0">
-        <Button class="p-align-end" icon="pi pi-plus" iconPos="right" label="Yeni Akıllı Kontrat Yükle"></Button>
-      </div>
-      <DataTable :value="chaincodes" class="border p-mt-2">
-        <Column field="ccName" header="Akıllı Kontrat Adı"></Column>
-        <Column field="version" header="Versiyonu"></Column>
-        <Column field="sequence" header="Sekans No"></Column>
-        <Column field="state" header="Durumu"></Column>
-      </DataTable>
     </div>
   </div>
-</div>
 </template>
 
 <script>
+import PeerService from "@/service/PeerService";
+import EventService from "@/service/EventService";
+import NewPeerDialog from "@/components/NewPeerDialog";
+import JoinChannelDialog from "@/components/JoinChannelDialog";
+import {EVENTS, INIT_ITEMS} from "@/utilities/Utils";
+
+const SUMMARY = "Düğüm İşlemleri";
+
 export default {
   name: "PeerOperations",
+  emits: [EVENTS.SHOW_PROGRESS_BAR, EVENTS.SHOW_TOAST],
+  components: {
+    'NewPeerDialog': NewPeerDialog,
+    'JoinChannelDialog': JoinChannelDialog
+  },
+  created() {
+    this.eventService = new EventService(this, SUMMARY);
+    this.getPeers();
+  },
+  methods: {
+    channelsTitle() {
+      return this.selectedPeer ? `${this.selectedPeer.peerName} Dahil Olunan Kanallar` : '';
+    },
+    onNewPeerClick() {
+      this.showNewPeerDialog = true;
+    },
+    onNewPeerDialogClosed(data) {
+      this.showNewPeerDialog = false;
+      if (data.newPeerConfig) {
+        this.sendNewPeer(data.newPeerConfig);
+      }
+    },
+    onNewChannelDialogClosed(data) {
+      this.showNewChannelDialog = false;
+      if (data.channelConfig) {
+        data.channelConfig.peerConfig = {
+          peerName: this.selectedPeer.peerName,
+          orgName: this.selectedPeer.orgName
+        }
+        this.sendNewChannel(data.channelConfig);
+      }
+    },
+    async getPeers() {
+      this.eventService.showProgress(true);
+      try {
+        this.peers = await PeerService.getPeers();
+        this.eventService.showProgress(false);
+      } catch (e) {
+        this.eventService.fail('Düğümler Çekilirken Hata Oluştu');
+      }
+    },
+    async getChannels(peer) {
+      try {
+        this.eventService.showProgress(true);
+        const channels = await PeerService.queryChannel({
+          peerConfig: {
+            peerName: peer.peerName,
+            orgName: localStorage.getItem(INIT_ITEMS.ORG_NAME)
+          }
+        });
+        this.channels = [];
+        channels.forEach(i => {
+          this.channels.push(i);
+        });
+        this.eventService.showProgress(false);
+        this.showDetails = true;
+        this.showChaincodeDetails = false;
+      } catch (e) {
+        this.eventService.fail(`${peer.peerName} Düğümünün Katıldığı Kanalları Çekme İşlemi Başarısız`);
+      }
+    },
+    async getChaincodes(channel) {
+      try {
+        this.eventService.showProgress(true);
+        this.chaincodes = await PeerService.chaincodeStates({
+          channelName: channel.label,
+          peerConfig: {
+            peerName: this.selectedPeer.peerName,
+            orgName: this.selectedPeer.orgName
+          }
+        });
+        this.eventService.showProgress(false);
+        this.showChaincodeDetails = true;
+      } catch (e) {
+        this.eventService.fail(`${this.selectedChannel.label} kanalında bulunan akıllı kontratları çekerken bir hata oluştu`)
+      }
+    },
+    async sendNewPeer(body) {
+      try {
+        this.eventService.showProgress(true);
+        await PeerService.createPeer(body);
+        this.peers = await PeerService.getPeers();
+        this.eventService.success('Yeni Peer Oluşturma İşlemi Başarılı');
+      } catch (e) {
+        this.eventService.fail('Yeni Peer Oluşturma İşlemi Başarısız');
+      }
+    },
+    async sendNewChannel(data) {
+      try {
+        this.eventService.showProgress(true);
+        await PeerService.joinChannel(data);
+        const channels = await PeerService.queryChannel({
+          peerConfig: {
+            peerName: this.selectedPeer.peerName,
+            orgName: localStorage.getItem(INIT_ITEMS.ORG_NAME)
+          }
+        });
+        this.channels = [];
+        channels.forEach(i => {
+          this.channels.push(i);
+        });
+        this.eventService.success(`Kanala Katılma İşlemi Başarılı: ${data.channelName}`);
+      } catch (e) {
+        this.eventService.fail(`Kanala Katılma İşlemi Başarısız: ${data.channelName}`);
+      }
+    }
+  },
   data() {
     return {
-      peers: [
-        {peerName: "peer1", port: 7058, host: "0.0.0.0"},
-        {peerName: "peer2", port: 7058, host: "0.0.0.0"},
-        {peerName: "peer3", port: 7058, host: "0.0.0.0"}
-      ],
-      channels: [
-        {channelName: "channel-1"},
-        {channelName: "channel-2"},
-        {channelName: "channel-3"},
-      ],
-      chaincodes: [
-        {ccName: "gvta", version: "0.0.1", sequence: 1, state: "instaleld"},
-        {ccName: "gvta", version: "0.0.1", sequence: 1, state: "instaleld"},
-        {ccName: "gvta", version: "0.0.1", sequence: 1, state: "instaleld"}
-      ],
+      peers: [],
+      channels: [],
+      chaincodes: [],
       selectedPeer: null,
-      selectedCC: null
+      selectedChannel: null,
+      eventService: null,
+      showDetails: false,
+      showChaincodeDetails: false,
+      showNewPeerDialog: false,
+      showNewChannelDialog: false
+    }
+  },
+  watch: {
+    selectedPeer: async function (newPeer) { // watch it
+      await this.getChannels(newPeer);
+    },
+    selectedChannel: async function (newChannel) {
+      await this.getChaincodes(newChannel);
     }
   }
 }
@@ -74,4 +200,9 @@ export default {
   border: 1px solid #ced4da;
   /*border-radius: 3px;*/
 }
+
+.background-white {
+  background-color: white;
+}
+
 </style>
\ No newline at end of file
diff --git a/Client/src/service/PeerService.js b/Client/src/service/PeerService.js
index 497754b..208d5bc 100644
--- a/Client/src/service/PeerService.js
+++ b/Client/src/service/PeerService.js
@@ -13,6 +13,9 @@ export default {
     queryChannel(data) {
         return Api().post('/channels', data).then(res => res.data);
     },
+    chaincodeStates(data) {
+      return Api().post('/ccStates', data).then(res => res.data);
+    },
     joinChannel(data) {
         return Api().post('/joinChannel', data).then(res => res.data);
     },
diff --git a/Server/controllers/PeerController.js b/Server/controllers/PeerController.js
index 765d51b..3c4c0fa 100644
--- a/Server/controllers/PeerController.js
+++ b/Server/controllers/PeerController.js
@@ -198,6 +198,7 @@ module.exports = {
                     peerName: i.name,
                     password: i.secret,
                     orgName: i.orgName,
+                    host: i.host,
                     port: i.port,
                     csrHosts: i.csrHosts
                 })