diff --git a/src/backend/Types/Items.ts b/src/backend/Types/Items.ts
index 49c7b67..1a40b6b 100644
--- a/src/backend/Types/Items.ts
+++ b/src/backend/Types/Items.ts
@@ -104,6 +104,7 @@ export const T2:string[] = [
 "Chromatic Boots",
 "Taut Dragonhide Gloves",
 "Shimmering Geta",
+"Ring of Blackrock",
 "Elementium Threaded Cloak",
 "Angelista's Grasp",
 "Girdle of the Fallen Crusader",
diff --git a/src/frontend/src/app/frontcraft/pages/character/character.component.html b/src/frontend/src/app/frontcraft/pages/character/character.component.html
index 7e0fe63..201a3d6 100644
--- a/src/frontend/src/app/frontcraft/pages/character/character.component.html
+++ b/src/frontend/src/app/frontcraft/pages/character/character.component.html
@@ -22,10 +22,29 @@ status="control">
         <span *ngIf="link === 'owner'">
             Owned by <a [routerLink]="'/frontcraft/user/'+char.username"> {{char.username}} ({{char.rank}})</a>
         </span>
-        <br/><br />
+        <br/>
+        <br />
+        <br />
+
+        <h3>Tokens</h3>
         <span *ngFor="let token of tokens">
             [ {{token.level}} ]
-            <wowhead [item]="token"></wowhead>
+            <wowhead [item]="token"></wowhead><br />
         </span>
+
+        <br />
+        <br />
+        <br />
+        <h3>Gear of the last two reported kills <a target="_blank" *ngIf="dataLink != null && dataLink != ''" style="size: 0.5em;" [href]="dataLink">(data)</a></h3>
+        
+        <h5>{{boss1.name}} {{boss1.date | date : 'MMM d @ HH : mm'}}</h5>
+        <ng-container *ngFor="let item of gear1">
+            <wowhead [item]="item"></wowhead><br />
+        </ng-container>
+
+        <h5>{{boss2.name}} {{boss2.date | date : 'MMM d @ HH : mm'}}</h5>
+        <ng-container *ngFor="let item of gear2">
+            <wowhead [item]="item"></wowhead><br />
+        </ng-container>
     </nb-card-body>
 </nb-card>
diff --git a/src/frontend/src/app/frontcraft/pages/character/character.component.ts b/src/frontend/src/app/frontcraft/pages/character/character.component.ts
index 4d32467..de8704a 100644
--- a/src/frontend/src/app/frontcraft/pages/character/character.component.ts
+++ b/src/frontend/src/app/frontcraft/pages/character/character.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, Input } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ApiService as ApiService } from '../../services/login-api';
-import { Spec, User, Character } from '../../../../../../backend/Types/Types';
+import { Spec, User, Character, Item } from '../../../../../../backend/Types/Types';
 import { getClassColor } from '../../../../../../backend/Types/PlayerSpecs';
 import { _Tiers } from '../../../../../../backend/Types/Items';
 
@@ -20,6 +20,12 @@ export class FrontcraftCharacterComponent implements OnInit{
     } as any
     color : string
     tokens
+    dataLink = ""
+    boss1 = {}
+    gear1:string[] = []
+    
+    boss2= {}
+    gear2:string[] = []
 
     constructor(
       private api: ApiService,
@@ -39,6 +45,41 @@ export class FrontcraftCharacterComponent implements OnInit{
           this.api.get('ItemManager').getTokens(this.char, _Tiers, true).then(tokens => {
             this.tokens = tokens
           })
+
+          this.dataLink = 'https://classic.warcraftlogs.com/v1/rankings/character/'+this.char.charactername.replace(/^\w/, c => c.toUpperCase())+'/Gandling/EU?metric=dps&api_key=c698515ab4f592cdb848d80b3abe616c'
+
+
+          fetch(this.dataLink).then(raw => raw.json().then((json) => {
+            if(json.length-1 < 0) return
+            const data = json[json.length-1]
+
+            this.boss2 = {
+              name: data.encounterName,
+              date: data.startTime
+            }
+            this.gear1 = data.gear.map(item => {return <Item>{
+              itemname: item.name,
+              iconname: item.icon.replace('.jpg', ''),
+              quality: item.quality.replace(/^\w/, c => c.toUpperCase()),
+              url: "https://classic.wowhead.com/item="+item.id
+            }})
+          }))
+
+          fetch(this.dataLink).then(raw => raw.json().then((json) => {
+            if(json.length-2 < 0) return
+            const data = json[json.length-2]
+
+            this.boss1 = {
+              name: data.encounterName,
+              date: data.startTime
+            }
+            this.gear2 = data.gear.map(item => {return <Item>{
+              itemname: item.name,
+              iconname: item.icon.replace('.jpg', ''),
+              quality: item.quality.replace(/^\w/, c => c.toUpperCase()),
+              url: "https://classic.wowhead.com/item="+item.id
+            }})
+          }))
         }
       })
     }
diff --git a/src/frontend/src/app/frontcraft/pages/raid/raid.component.ts b/src/frontend/src/app/frontcraft/pages/raid/raid.component.ts
index 0b44473..fcfe70c 100644
--- a/src/frontend/src/app/frontcraft/pages/raid/raid.component.ts
+++ b/src/frontend/src/app/frontcraft/pages/raid/raid.component.ts
@@ -147,12 +147,12 @@ export class FrontcraftRaidComponent implements OnInit, OnDestroy{
       this.toast.show('Signup', 'Success', { status: 'success' })
     }
 
-    adminUnsign = async() => {
+    adminUnsign = async(character:Character) => {
       const manage =  this.api.get('manageRaid')
       if(!manage) return
       await manage.adminUnsign({
-        ...this.mySignup,
-        id: this.mySignup.characterid, 
+        ...character,
+        id: character['characterid']
       }, this.raid)
     }
 
diff --git a/src/frontend/src/app/frontcraft/pages/shop/item.component.ts b/src/frontend/src/app/frontcraft/pages/shop/item.component.ts
index 8d6939e..c7da5b5 100644
--- a/src/frontend/src/app/frontcraft/pages/shop/item.component.ts
+++ b/src/frontend/src/app/frontcraft/pages/shop/item.component.ts
@@ -9,7 +9,12 @@ import { _Tiers, allItems, Tiers } from '../../../../../../backend/Types/Items';
 @Component({
     selector: 'item',
     template: `
-        <span [ngStyle]="{'color':item.quality=='Epic'?'#a335ee':'#ff8000'}">
+        <span [ngStyle]="{'color':item.quality=='Poor'?'#9d9d9d':
+                                  item.quality=='Common'?'#FFFFFF':
+                                  item.quality=='Uncommon'?'#1eff00':
+                                  item.quality=='Rare'?'#0070dd':
+                                  item.quality=='Epic'?'#a335ee':
+                                  '#ff8000'}">
             <img style="min-width: 20px; width: 2.25vw; max-width: 35px" 
             [src]="'https://wow.zamimg.com/images/wow/icons/large/'+item.iconname+'.jpg'" />
             &nbsp;