diff --git a/package.json b/package.json
index e4c0c6b..47805a4 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@hashgraph/sdk": "^2.0.15",
+    "@hashgraph/sdk": "^2.5.0",
     "@koumoul/vjsf": "^1.17.1",
     "bignumber.js": "^9.0.0",
     "core-js": "^3.6.5",
@@ -30,7 +30,7 @@
     "eslint-plugin-prettier": "^3.1.3",
     "eslint-plugin-vue": "^6.2.2",
     "prettier": "^1.19.1",
-    "sass": "^1.19.0",
+    "sass": "^1.41.1",
     "sass-loader": "^8.0.0",
     "vue-cli-plugin-vuetify": "~2.0.7",
     "vue-template-compiler": "^2.6.11",
diff --git a/src/components/ComposerDialog.vue b/src/components/ComposerDialog.vue
index 2538b6d..86eec1b 100644
--- a/src/components/ComposerDialog.vue
+++ b/src/components/ComposerDialog.vue
@@ -3,8 +3,8 @@
     <v-dialog v-model="dialog" persistent max-width="800px">
       <v-toolbar>
         <v-tabs centered v-model="tabs">
-          <v-tab>Fungible</v-tab>
-          <v-tab>Non Fungible</v-tab>
+          <v-tab>Fungible Common</v-tab>
+          <v-tab>Non Fungible Unique</v-tab>
         </v-tabs>
       </v-toolbar>
       <v-tabs-items v-model="tabs">
diff --git a/src/components/FungibleComposer.vue b/src/components/FungibleComposer.vue
index ca8a8a9..6419a1e 100644
--- a/src/components/FungibleComposer.vue
+++ b/src/components/FungibleComposer.vue
@@ -5,10 +5,7 @@
         Name
       </v-stepper-step>
       <v-divider></v-divider>
-      <v-stepper-step
-        :complete="step > STEP_FRACTIONAL"
-        :step="STEP_FRACTIONAL"
-      >
+      <v-stepper-step :complete="step > STEP_FRACTIONAL" :step="STEP_FRACTIONAL">
         Fractional
       </v-stepper-step>
       <v-divider></v-divider>
@@ -16,6 +13,10 @@
         Supply
       </v-stepper-step>
       <v-divider></v-divider>
+      <v-stepper-step :complete="step > STEP_CUSTOMFEES" :step="STEP_CUSTOMFEES">
+        Custom Fees
+      </v-stepper-step>
+      <v-divider></v-divider>
       <v-stepper-step :complete="step > STEP_MUTABLE" :step="STEP_MUTABLE">
         Mutable
       </v-stepper-step>
@@ -184,6 +185,88 @@
         </v-row>
       </v-stepper-content>
 
+      <v-stepper-content :step="STEP_CUSTOMFEES">
+          <v-card class="mb-12" :height="cardHeight" flat>
+            <v-card-text>
+              <v-form ref="customFeeForm" v-model="customFeeValid">
+                <v-row>
+                  <v-col cols="12">
+                    Custom fees are fees that are distributed to the specified
+                    accounts each time the token is transferred
+                    programmatically.
+                  </v-col>
+                </v-row>
+                <v-row>
+                  <v-col cols="4">
+                    <v-radio-group v-model="customFeeSelected">
+                      <v-radio
+                        name="customFeeSelected"
+                        label="No Custom Fees"
+                        value="none"
+                      ></v-radio>
+                      <v-radio
+                        name="customFeeSelected"
+                        label="Fixed"
+                        value="fixed"
+                      ></v-radio>
+                      <v-radio
+                        name="customFeeSelected"
+                        label="Fractional"
+                        value="fractional"
+                      ></v-radio>
+                      <v-radio
+                        name="customFeeSelected"
+                        label="Royalty"
+                        value="royalty"
+                      ></v-radio>
+                    </v-radio-group>
+                  </v-col>
+                  <v-col cols="5">
+                    <v-text-field
+                      v-if="customFeeSelected === 'fixed'"
+                      label="Fixed Fee*"
+                      :rules="customFeeRules"
+                      v-model="customFees"
+                    ></v-text-field>
+                  </v-col>
+                  <v-col cols="4">
+                    <v-text-field
+                      v-if="customFeeSelected === 'royalty' || customFeeSelected === 'fractional'"
+                      label="numerator*"
+                      required
+                      v-model="customFeeNumerator"
+                      :rules="numeratorRules"
+                    ></v-text-field>
+                  </v-col>
+                  <v-col cols="4">
+                    <v-text-field
+                      v-if="customFeeSelected === 'royalty' || customFeeSelected === 'fractional'"
+                      label="denominator*"
+                      required
+                      v-model="customFeeDenominator"
+                      :rules="denominatorRules"
+                    ></v-text-field>
+                  </v-col>
+                </v-row>
+              </v-form> 
+            </v-card-text>
+          </v-card>
+          <v-row>
+            <v-col>
+              <v-btn text @click="cancel"> Cancel </v-btn>
+            </v-col>
+            <v-spacer></v-spacer>
+            <v-col>
+              <v-btn
+                color="primary"
+                @click="nextStep"
+              >
+                Continue
+              </v-btn>
+            </v-col>
+          </v-row>
+        </v-stepper-content>
+
       <v-stepper-content :step="STEP_MUTABLE">
         <v-card class="mb-12" height="200px" flat>
           <v-card-text>
@@ -308,7 +391,7 @@
       <v-stepper-content :step="STEP_CREATE">
         <v-card class="mb-12" height="200px" flat>
           <v-card-title>
-            You're about to create a fungible token named {{ name }} ({{
+            You're about to create a fungible common token named {{ name }} ({{
               symbol.toUpperCase()
             }})
           </v-card-title>
@@ -347,7 +430,7 @@
 <script>
 import { EventBus } from "../eventBus";
 import { getAccountDetails } from "@/utils";
-import { PrivateKey } from "@hashgraph/sdk";
+import { PrivateKey, TokenType } from "@hashgraph/sdk";
 import { tokenCreate } from "@/service/tokenService";
 
 export default {
@@ -357,12 +440,14 @@ export default {
       STEP_NAME: 1,
       STEP_FRACTIONAL: 2,
       STEP_SUPPLY: 3,
-      STEP_MUTABLE: 4,
-      STEP_KYC: 5,
-      STEP_WIPEABLE: 6,
-      STEP_FREEZABLE: 7,
-      STEP_CREATE: 8,
+      STEP_CUSTOMFEES: 4,
+      STEP_MUTABLE: 5,
+      STEP_KYC: 6,
+      STEP_WIPEABLE: 7,
+      STEP_FREEZABLE: 8,
+      STEP_CREATE: 9,
       nameValid: false,
+      customFeeValid: false,
       decimalsValid: false,
       supplyValid: false,
       step: 1,
@@ -379,12 +464,19 @@ export default {
         v => !!v || "Input required",
         v => v.length <= 100 || "Max length 100"
       ],
+      customFeeRules: [
+        (n) => !!n || "Please enter an integer",
+        (n) => !isNaN(parseInt(n)) || "Please enter a number",
+      ],
       symbolRules: [
         v => !!v || "Input required",
         v => v.length <= 100 || "Max length 100"
-        // v => /^[a-zA-Z]*$/.test(v) || "Only letters are allowed"
       ],
       name: "",
+      customFees: 0,
+      customFeeSelected: "fixed",
+      customFeeNumerator: 0,
+      customFeeDenominator: 0,
       symbol: "",
       decimals: "",
       initialSupply: 0,
@@ -401,6 +493,7 @@ export default {
   methods: {
     init() {
       this.nameValid = false;
+      this.customFeeValid = false;
       this.decimalsValid = false;
       this.supplyValid = false;
       this.fractional = "no";
@@ -412,10 +505,15 @@ export default {
       this.step = 1;
       //
       this.name = "";
+      this.tokenType = TokenType.FungibleCommon,
       this.symbol = "";
       this.decimals = "";
       this.initialSupply = "0";
       this.defaultFreezeStatus = false;
+      this.customFees = 0;
+      this.customFeeNumerator = 0;
+      this.customFeeDenominator = 0;
+      this.customFeesSelected = "";
     },
     nextStep() {
       this.step = this.step + 1;
@@ -460,9 +558,14 @@ export default {
       const issuerAccount = getAccountDetails("Issuer");
       const token = {
         name: this.name,
+        tokenType: TokenType.FungibleCommon,
         symbol: this.symbol,
         decimals: this.decimals === "" ? 0 : this.decimals,
         initialSupply: this.initialSupply,
+        customFees: this.customFees,
+        customFeeNumerator: this.customFeeNumerator,
+        customFeeDenominator: this.customFeeDenominator,
+        customFeeSelected: this.customFeeSelected,
         adminKey: this.mutable === "yes" ? privateKey.toString() : undefined,
         kycKey: this.kyc === "yes" ? privateKey.toString() : undefined,
         freezeKey: this.freeze === "yes" ? privateKey.toString() : undefined,
diff --git a/src/components/MintBurnDialog.vue b/src/components/MintBurnDialog.vue
index 759e581..af63f7c 100644
--- a/src/components/MintBurnDialog.vue
+++ b/src/components/MintBurnDialog.vue
@@ -5,8 +5,7 @@
         <v-card>
           <v-card-title>
             <span v-if="operation === 'mint'" class="headline"
-              >Mint additional tokens</span
-            >
+              >Mint additional tokens</span>
             <span v-else class="headline">Burn tokens</span>
           </v-card-title>
           <v-card-text>
@@ -34,8 +33,7 @@
               text
               @click="mint"
               :disabled="!valid"
-              v-if="operation === 'mint'"
-            >
+              v-if="operation === 'mint'">
               Mint
             </v-btn>
             <v-btn
@@ -43,8 +41,7 @@
               text
               @click="burn"
               :disabled="!valid"
-              v-if="operation === 'burn'"
-            >
+              v-if="operation === 'burn'">
               Burn
             </v-btn>
           </v-card-actions>
diff --git a/src/components/NonFungibleComposer.vue b/src/components/NonFungibleComposer.vue
index 316ab7e..636e0ee 100644
--- a/src/components/NonFungibleComposer.vue
+++ b/src/components/NonFungibleComposer.vue
@@ -34,6 +34,20 @@
           Properties
         </v-stepper-step>
         <v-divider></v-divider>
+        <v-stepper-step
+          :complete="step > STEP_MAXSUPPLY"
+          :step="STEP_MAXSUPPLY"
+        >
+          Supply
+        </v-stepper-step>
+        <v-divider></v-divider>
+        <v-stepper-step
+          :complete="step > STEP_CUSTOMFEES"
+          :step="STEP_CUSTOMFEES"
+        >
+          Custom Fees
+        </v-stepper-step>
+        <v-divider></v-divider>
         <v-stepper-step :complete="step > STEP_KYC" :step="STEP_KYC">
           KYC
         </v-stepper-step>
@@ -150,6 +164,118 @@
           </v-row>
         </v-stepper-content>
 
+        <v-stepper-content :step="STEP_MAXSUPPLY">
+          <v-card class="mb-12" :height="cardHeight" flat>
+            <v-card-text>
+              <v-form ref="supplyForm" v-model="supplyValid">
+                <v-row>
+                  <v-col cols="12">
+                    The maximum number of NFTs that can be minted.
+                  </v-col>
+                </v-row>
+                <v-row>
+                  <v-col cols="8">
+                    <v-text-field
+                      label="Maximum Supply*"
+                      :rules="supplyRules"
+                      v-model="maxSupply"
+                    ></v-text-field>
+                  </v-col>
+                </v-row>
+              </v-form>
+            </v-card-text>
+          </v-card>
+          <v-row>
+            <v-col>
+              <v-btn text @click="cancel"> Cancel </v-btn>
+            </v-col>
+            <v-spacer></v-spacer>
+            <v-col>
+              <v-btn color="primary" @click="nextStep" :disabled="!supplyValid">
+                Continue
+              </v-btn>
+            </v-col>
+          </v-row>
+        </v-stepper-content>
+
+        <v-stepper-content :step="STEP_CUSTOMFEES">
+          <v-card class="mb-12" :height="cardHeight" flat>
+            <v-card-text>
+              <v-form ref="customFeeForm" v-model="customFeeValid">
+                <v-row>
+                  <v-col cols="12">
+                    Custom fees are fees that are distributed to the specified
+                    accounts each time the token is transferred
+                    programmatically.
+                  </v-col>
+                </v-row>
+                <v-row>
+                  <v-col cols="4">
+                    <v-radio-group v-model="customFeeSelected">
+                      <v-radio
+                        name="customFeeSelected"
+                        label="No Custom Fees"
+                        value=" "
+                      ></v-radio>
+                      <v-radio
+                        name="customFeeSelected"
+                        label="Fixed"
+                        value="fixed"
+                      ></v-radio>
+                      <v-radio
+                        name="customFeeSelected"
+                        label="Royalty"
+                        value="royalty"
+                      ></v-radio>
+                    </v-radio-group>
+                  </v-col>
+                  <v-col cols="5">
+                    <v-text-field
+                      v-if="customFeeSelected === 'fixed'"
+                      label="Fixed Fee*"
+                      :rules="customFeeRules"
+                      v-model="customFees"
+                    ></v-text-field>
+                  </v-col>
+                  <v-col cols="4">
+                    <v-text-field
+                      v-if="customFeeSelected === 'royalty'"
+                      label="numerator*"
+                      required
+                      v-model="customFeeNumerator"
+                      :rules="numeratorRules"
+                    ></v-text-field>
+                  </v-col>
+                  <v-col cols="4">
+                    <v-text-field
+                      v-if="customFeeSelected === 'royalty'"
+                      label="denominator*"
+                      required
+                      v-model="customFeeDenominator"
+                      :rules="denominatorRules"
+                    ></v-text-field>
+                  </v-col>
+                </v-row>
+              </v-form> 
+            </v-card-text>
+          </v-card>
+          <v-row>
+            <v-col>
+              <v-btn text @click="cancel"> Cancel </v-btn>
+            </v-col>
+            <v-spacer></v-spacer>
+            <v-col>
+              <v-btn
+                color="primary"
+                @click="nextStep"
+                :disabled="!customFeeValid"
+              >
+                Continue
+              </v-btn>
+            </v-col>
+          </v-row>
+        </v-stepper-content>
+
         <v-stepper-content :step="STEP_KYC">
           <v-card class="mb-12" :height="cardHeight" flat>
             <v-card-text>
@@ -235,26 +361,31 @@
 <script>
 import { EventBus } from "../eventBus";
 import { getAccountDetails } from "@/utils";
-import { PrivateKey } from "@hashgraph/sdk";
+import { PrivateKey, TokenType } from "@hashgraph/sdk";
 import { tokenCreate } from "@/service/tokenService";
 import VJsf from "@koumoul/vjsf/lib/VJsf.js";
 import "@koumoul/vjsf/lib/VJsf.css";
 import "@koumoul/vjsf/lib/deps/third-party.js";
 import { fileCreate } from "@/service/fileService";
 import { loadTokenTemplates } from "@/service/tokenProperties";
+import { tokenMint } from "../service/tokenService";
 
 export default {
   name: "NonFungibleComposer",
   components: { VJsf },
-  data: function() {
+  data: function () {
     return {
       STEP_NAME: 1,
       STEP_TEMPLATE: 2,
       STEP_PROPERTIES: 3,
-      STEP_KYC: 4,
-      STEP_FREEZABLE: 5,
-      STEP_CREATE: 6,
+      STEP_MAXSUPPLY: 4,
+      STEP_CUSTOMFEES: 5,
+      STEP_KYC: 6,
+      STEP_FREEZABLE: 7,
+      STEP_CREATE: 8,
       nameValid: false,
+      customFeeValid: false,
+      supplyValid: false,
       step: 1,
       kyc: "no",
       freeze: "no",
@@ -263,10 +394,33 @@ export default {
       cardHeight: 300,
       NFT_STORAGE_API_KEY: process.env.VUE_APP_NFT_STORAGE_API_KEY,
       nameRules: [
-        v => !!v || "Input required",
-        v => v.length <= 100 || "Max length 100"
+        (v) => !!v || "Input required",
+        (v) => v.length <= 100 || "Max length 100",
+      ],
+      customFeeRules: [
+        (n) => !!n || "Please enter an integer",
+        (n) => !isNaN(parseInt(n)) || "Please enter a number",
+      ],
+      numeratorRules: [
+        (n) => !!n || "Please enter an integer",
+        (n) => !isNaN(parseInt(n)) || "Please enter a valid number less than the denominator",
       ],
+      denominatorRules: [
+        (n) => !!n || "Please enter an integer",
+        (n) => !isNaN(parseInt(n)) || "Please enter a valid number less than the denominator"
+      ],
+      supplyRules: [
+        (n) => !!n || "Please enter an integer",
+        (n) => !isNaN(parseInt(n)) || "Please enter a number",
+      ],
+      customFeeOptions: ["Fixed", "Royalty"],
+      selectedFeeOption: "",
       name: "",
+      customFees: 0,
+      customFeeSelected: "fixed",
+      customFeeNumerator: 0,
+      customFeeDenominator: 0,
+      maxSupply: 0,
       symbol: "",
       defaultFreezeStatus: false,
       ///
@@ -274,11 +428,11 @@ export default {
       model: {},
       schema: {
         type: "object",
-        properties: {}
+        properties: {},
       },
       tokenTemplates: {},
       tokenTemplate: "",
-      tokenTemplatesForSelection: []
+      tokenTemplatesForSelection: [],
     };
   },
   created() {
@@ -290,20 +444,28 @@ export default {
   computed: {
     imageData() {
       return this.imageBase64();
-    }
+    },
   },
   methods: {
     init() {
       this.nameValid = false;
+      this.customFeeValid = false;
+      this.supplyValid = false;
       this.kyc = "no";
       this.freeze = "no";
       this.step = 1;
       //
       this.name = "";
-      this.symbol = "";
+      (this.tokenType = TokenType.NonFungibleUnique), (this.symbol = "");
       this.defaultFreezeStatus = false;
       this.template = "";
+      this.metadata = "";
       this.photoSize = 0;
+      this.customFees = 0;
+      this.customFeeNumerator = 0;
+      this.customFeeDenominator = 0;
+      this.customFeesSelected = "";
+      this.maxSupply = 0;
       this.tokenTemplates = loadTokenTemplates();
       this.tokenTemplatesForSelection = [];
       for (const templateItem in this.tokenTemplates) {
@@ -317,7 +479,7 @@ export default {
       if (this.tokenTemplate === "") {
         this.schema = {
           type: "object",
-          properties: {}
+          properties: {},
         };
       } else {
         this.schema = this.tokenTemplates[this.tokenTemplate];
@@ -378,20 +540,38 @@ export default {
           symbol:
             (this.model.Storage === "HEDERA" ? "hedera://" : "ipfs://") +
             fileId,
+          customFees: this.customFees,
+          customFeeNumerator: this.customFeeNumerator,
+          customFeeDenominator: this.customFeeDenominator,
+          customFeeSelected: this.customFeeSelected,
+          maxSupply: this.maxSupply,
           decimals: 0,
-          initialSupply: 1,
+          initialSupply: 0,
           adminKey: undefined,
+          tokenType: TokenType.NonFungibleUnique,
           kycKey: this.kyc === "yes" ? privateKey.toString() : undefined,
           freezeKey: this.freeze === "yes" ? privateKey.toString() : undefined,
           wipeKey: undefined,
-          supplyKey: undefined,
+          supplyKey: privateKey.toString(),
           defaultFreezeStatus: this.defaultFreezeStatus,
           autoRenewAccount: issuerAccount.accountId,
           treasury: issuerAccount.accountId,
           deleted: false,
-          key: privateKey.toString()
+          key: privateKey.toString(),
+          schema: this.schema,
         };
-        const newToken = await tokenCreate(token);
+
+        let newToken = await tokenCreate(token);
+
+        newToken.isNFT =
+          newToken.symbol.includes("HEDERA://") ||
+          newToken.symbol.includes("IPFS://");
+
+        if (newToken.isNFT) {
+          let tokenInfo = await tokenMint(token);
+          newToken.serialNumber = tokenInfo.serialNumber;
+        }
+
         if (typeof newToken.tokenId !== "undefined") {
           this.$store.commit("setToken", newToken);
           EventBus.$emit("dialogClose");
@@ -436,8 +616,8 @@ export default {
     tokenDetails() {
       let details = "It will be non-fractional with a fixed supply of 1.";
       return details;
-    }
-  }
+    },
+  },
 };
 </script>
 <!-- Add "scoped" attribute to limit CSS to this component only -->
diff --git a/src/components/TokenCard.vue b/src/components/TokenCard.vue
index dde674a..55bb148 100644
--- a/src/components/TokenCard.vue
+++ b/src/components/TokenCard.vue
@@ -35,13 +35,17 @@
         <v-col cols="6">Supply</v-col>
         <v-col cols="6">{{ totalSupply }}</v-col>
       </v-row>
+      <v-row>
+        <v-col cols="6">Serial Number</v-col>
+        <v-col cols="6">{{ token.serialNumber }}</v-col>
+      </v-row>
     </v-card-text>
     <v-card-actions class="justify-center">
       <v-btn color="blue darken-1" icon @click="showAccounts">
         <v-icon>mdi-account-multiple</v-icon>
       </v-btn>
       <v-btn
-        :disabled="!this.token.supplyKey"
+        :disabled="!this.token.supplyKey || this.token.isNFT"
         color="blue darken-1"
         icon
         @click="mintToken"
@@ -104,9 +108,6 @@ export default {
     this.token = this.$store.getters.getTokens[this.tokenId];
     this.defaultFreezeStatus = this.token.defaultFreezeStatus;
 
-    this.token.isNFT =
-      this.token.symbol.includes("HEDERA://") ||
-      this.token.symbol.includes("IPFS://");
     if (this.token.isNFT) {
       // Check if this NFT token metadata stored on Hedera File Service or on IPFS.
       if (this.token.symbol.includes("HEDERA://")) {
diff --git a/src/components/TokenCreateDialog.vue b/src/components/TokenCreateDialog.vue
index f34487f..f300be8 100644
--- a/src/components/TokenCreateDialog.vue
+++ b/src/components/TokenCreateDialog.vue
@@ -151,7 +151,6 @@ export default {
       symbolRules: [
         v => !!v || "Input required",
         v => v.length <= 100 || "Max length 100"
-        // v => /^[a-zA-Z]*$/.test(v) || "Only letters are allowed"
       ]
     };
   },
diff --git a/src/components/TokenDetailsDialog.vue b/src/components/TokenDetailsDialog.vue
index 72e09e8..c8681df 100644
--- a/src/components/TokenDetailsDialog.vue
+++ b/src/components/TokenDetailsDialog.vue
@@ -79,6 +79,18 @@
             </v-col>
           </v-row>
 
+          <v-row v-if="token.customFees" dense>
+            <v-col cols="6"
+              ><v-text-field
+                label="Custom Fees"
+                :value="customFees"
+                outlined
+                dense
+                disabled
+              ></v-text-field>
+            </v-col>
+          </v-row>
+
           <v-row dense>
             <v-col cols="4">
               <v-checkbox
@@ -216,7 +228,7 @@
 </template>
 <script>
 import { EventBus } from "../eventBus";
-import { amountWithDecimals, secondsToParts } from "../utils";
+import { amountWithDecimals, secondsToParts, amountWithFraction } from "../utils";
 import { fileGetContents } from "@/service/fileService";
 
 export default {
@@ -229,6 +241,7 @@ export default {
       initialSupply: 0,
       supply: 0,
       expiry: 0,
+      customFees: undefined,
       autoRenewPeriod: "",
       headingColor: "primary",
       title: "",
@@ -246,6 +259,20 @@ export default {
       vm.token = value;
       vm.supply = amountWithDecimals(value.totalSupply, value.decimals);
       vm.expiry = value.expiry;
+
+      if(value.customFees){
+        vm.customFees = [];
+        for (const key in value.customFees) {
+          const customFee = value.customFees[key];
+
+          if(customFee.amount){
+            vm.customFees.push(parseInt(customFee.amount) + " Hbar");
+          }
+          else{
+            vm.customFees.push(amountWithFraction(value.customFees[key]));
+          }
+        }
+      }
       vm.autoRenewPeriod = secondsToParts(value.autoRenewPeriod);
       vm.headingColor = value.isNFT ? "" : "primary";
       vm.title = value.isNFT
diff --git a/src/components/Wallet.vue b/src/components/Wallet.vue
index 2b24b19..f3646cc 100644
--- a/src/components/Wallet.vue
+++ b/src/components/Wallet.vue
@@ -9,7 +9,7 @@
             class="elevation-1"
             hide-default-footer
           >
-            <template v-slot:item.image="{ item }">
+            <template v-slot:[`item.image`]="{ item }">
               <v-img
                 v-if="item.imageData"
                 :src="item.imageData"
@@ -18,26 +18,26 @@
               ></v-img>
             </template>
 
-            <template v-slot:item.tokenName="{ item }">
+            <template v-slot:[`item.tokenName`]="{ item }">
               {{ item.tokenName }} (<a :href="mirrorURL" target="_blank">{{
                 item.tokenId
               }}</a
               >)
             </template>
 
-            <template v-slot:item.freezeStatus="{ item }">
+            <template v-slot:[`item.freezeStatus`]="{ item }">
               <v-chip :color="getColor(item.freezeStatus, true)" dark>
                 {{ item.freezeStatus }}
               </v-chip>
             </template>
 
-            <template v-slot:item.kycStatus="{ item }">
+            <template v-slot:[`item.kycStatus`]="{ item }">
               <v-chip :color="getColor(item.kycStatus, false)" dark>
                 {{ item.kycStatus }}
               </v-chip>
             </template>
 
-            <template v-slot:item.related="{ item }">
+            <template v-slot:[`item.related`]="{ item }">
               <v-chip :color="getColor(item.related, false)" dark>
                 {{ item.related }}
               </v-chip>
@@ -357,6 +357,7 @@ export default {
         .tokenRelationships;
       // cycle all available tokens
       const tokens = this.$store.getters.getTokens;
+
       for (const oneTokenId in tokens) {
         const oneToken = {
           tokenId: oneTokenId,
diff --git a/src/service/tokenService.js b/src/service/tokenService.js
index bd63f0b..e256e1c 100644
--- a/src/service/tokenService.js
+++ b/src/service/tokenService.js
@@ -21,7 +21,11 @@ const {
   TokenUnfreezeTransaction,
   TokenWipeTransaction,
   Hbar,
-  Status
+  CustomFixedFee,
+  Status,
+  CustomFractionalFee,
+  CustomRoyaltyFee,
+  CustomFee
 } = require("@hashgraph/sdk");
 
 function issuerClient() {
@@ -38,6 +42,8 @@ export async function tokenGetInfo(token) {
 
     tokenResponse.totalSupply = info.totalSupply;
     tokenResponse.expiry = info.expirationTime.toDate();
+    tokenResponse.customFees = info.customFees;
+
   } catch (err) {
     notifyError(err.message);
   }
@@ -54,12 +60,39 @@ export async function tokenCreate(token) {
     let sigKey;
     const tx = await new TokenCreateTransaction();
     tx.setTokenName(token.name);
+    tx.setTokenType(token.tokenType);
     tx.setTokenSymbol(token.symbol.toUpperCase());
     tx.setDecimals(token.decimals);
     tx.setInitialSupply(token.initialSupply);
     tx.setTreasuryAccountId(token.treasury);
     tx.setAutoRenewAccountId(token.autoRenewAccount);
     tx.setAutoRenewPeriod(autoRenewPeriod);
+    
+    if(token.customFeeSelected !== " ") {
+      let fee = new CustomFee();
+      if(token.customFeeSelected === "fixed"){
+        fee = new CustomFixedFee();
+        fee.setAmount(Number(token.customFees));
+        tx.setCustomFees([fee]);
+      }
+      else if(token.customFeeSelected === "fractional"){
+        //modify to only allow this for fungible common
+        fee = new CustomFractionalFee();
+        fee.setNumerator(parseInt(token.customFeeNumerator))
+        fee.setDenominator(parseInt(token.customFeeDenominator))
+        tx.setCustomFees([fee]);
+      }
+      else if(token.customFeeSelected === "royalty"){
+        fee = new CustomRoyaltyFee();
+        fee.setNumerator(parseInt(token.customFeeNumerator))
+        fee.setDenominator(parseInt(token.customFeeDenominator))
+        tx.setCustomFees([fee]);
+      }
+      else {
+        //notifyError("Custom Fee Error");
+      }
+      fee.setFeeCollectorAccountId(issuerAccount);
+    }
 
     if (token.adminKey) {
       sigKey = PrivateKey.fromString(token.key);
@@ -90,17 +123,16 @@ export async function tokenCreate(token) {
       tx.setSupplyKey(sigKey.publicKey);
     }
     const client = issuerClient();
-
+    tx.freezeWith(client);
     await tx.signWithOperator(client);
 
     if (additionalSig) {
-      // TODO: should sign with every key (check docs)
-      // since the admin/kyc/... keys are all the same, a single sig is sufficient
       await tx.sign(sigKey);
     }
+
     const response = await tx.execute(client);
     const transactionReceipt = await response.getReceipt(client);
-
+    
     if (transactionReceipt.status !== Status.Success) {
       notifyError(transactionReceipt.status.toString());
     } else {
@@ -128,7 +160,9 @@ export async function tokenCreate(token) {
       tokenResponse = {
         tokenId: token.tokenId.toString(),
         symbol: token.symbol.toUpperCase(),
+        type: token.tokenType,
         name: token.name,
+        customFees: token.customFees,
         totalSupply: token.initialSupply,
         decimals: token.decimals,
         autoRenewAccount: issuerAccount,
@@ -151,7 +185,8 @@ export async function tokenCreate(token) {
         if (token.kycKey) {
           const instruction = {
             tokenId: token.tokenId,
-            accountId: marketAccountId
+            accountId: marketAccountId,
+            kycKey: token.kycKey
           };
           tokenGrantKYC(instruction);
         }
@@ -180,19 +215,23 @@ async function tokenTransactionWithAmount(
   instruction,
   key
 ) {
+  
   try {
-    transaction.setTokenId(instruction.tokenId);
-    if (typeof instruction.accountId !== "undefined") {
-      transaction.setAccountId(instruction.accountId);
+    if(instruction.initialSupply > 0){
+      transaction.setAmount(instruction.amount);
     }
-    transaction.setAmount(instruction.amount);
-
+    else {
+      transaction.setMetadata([[Buffer.from(instruction.symbol)]]);
+    }
+    transaction.setTokenId(instruction.tokenId.toString());
+    
     await transaction.signWithOperator(client);
     await transaction.sign(key);
 
     const response = await transaction.execute(client);
-
+  
     const transactionReceipt = await response.getReceipt(client);
+
     if (transactionReceipt.status !== Status.Success) {
       notifyError(transactionReceipt.status.toString());
       return {
@@ -204,7 +243,8 @@ async function tokenTransactionWithAmount(
     notifySuccess(instruction.successMessage);
     return {
       status: true,
-      transactionId: response.transactionId.toString()
+      transactionId: response.transactionId.toString(),
+      serialNumber: transactionReceipt.serials[0]
     };
   } catch (err) {
     notifyError(err.message);
@@ -279,11 +319,12 @@ export async function tokenBurn(instruction) {
 
 export async function tokenMint(instruction) {
   instruction.successMessage =
-    "Minted " + instruction.amount + " for token " + instruction.tokenId;
-  const token = state.getters.getTokens[instruction.tokenId];
-  const supplyKey = PrivateKey.fromString(token.supplyKey);
-  const tx = await new TokenMintTransaction();
+    "Minted token " + instruction.tokenId;
+    
+  const supplyKey = PrivateKey.fromString(instruction.supplyKey);
+  const tx = new TokenMintTransaction();
   const client = issuerClient();
+  
   const result = await tokenTransactionWithAmount(
     client,
     tx,
@@ -295,11 +336,11 @@ export async function tokenMint(instruction) {
       id: result.transactionId,
       type: "tokenMint",
       inputs:
-        "tokenId=" + instruction.tokenId + ", Amount=" + instruction.amount
+        "tokenId=" + instruction.tokenId + ", Amount=" + 1 + "Serial Number=" + result.serial
     };
     EventBus.$emit("addTransaction", transaction);
   }
-  return result.status;
+  return result;
 }
 
 export async function tokenWipe(instruction) {
@@ -388,8 +429,7 @@ export async function tokenUnFreeze(instruction) {
 }
 
 export async function tokenGrantKYC(instruction) {
-  const token = state.getters.getTokens[instruction.tokenId];
-  const kycKey = PrivateKey.fromString(token.kycKey);
+  const kycKey = PrivateKey.fromString(instruction.kycKey);
   const tx = await new TokenGrantKycTransaction();
   instruction.successMessage =
     "Account " + instruction.accountId + " KYC Granted";
diff --git a/src/store/store.js b/src/store/store.js
index 23ccaba..f43692c 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -177,6 +177,7 @@ export default new Vuex.Store({
           return;
         }
         const token = state.tokens[key];
+        
         const tokenUpdate = await tokenGetInfo(token);
         commit("setToken", tokenUpdate);
       }
diff --git a/src/utils.js b/src/utils.js
index 6c61032..a2767ee 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -108,3 +108,7 @@ export function secondsToParts(seconds) {
   }
   return result;
 }
+
+export function amountWithFraction(customFee) {
+  return parseInt(customFee.numerator) + " / " + customFee.denominator;
+}