diff --git a/Master.as b/Master.as
index c2cee32..7a7c629 100644
--- a/Master.as
+++ b/Master.as
@@ -69,7 +69,7 @@
 	public var userInfo:ArrayCollection;
 	
 	/* Pop Up Windows */
-	private var tuveVW:videoWindow;
+	public  var tuveVW:videoWindow;
 	private var tuveBW:bioWindow;
 	private var tuveNBW:newBio;
 	private var tuveUW:uploadWindow;
@@ -128,6 +128,10 @@
   	  	tuveBW.addEventListener("closeWindow",tuveCloseBW,false,0,true);   	  	
    	  	masterObject.addChild(tuveBW);
    	    }
+   	  else {
+   	  	tuveBW.bioData = artist;
+   	  	tuveBW.findBio();
+   	    }
       } /* End tuveShowBW() */
       
     /* This function closes the channel list window */
diff --git a/bioWindow.mxml b/bioWindow.mxml
index 039bdf2..117c124 100644
--- a/bioWindow.mxml
+++ b/bioWindow.mxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tvWindow xmlns:mx="http://www.adobe.com/2006/mxml" xmlns="*" layout="absolute" cornerRadius="7" title="Video Manager" width="975" height="620" creationComplete="doInit()" horizontalScrollPolicy="off" verticalScrollPolicy="off">
+<tvWindow xmlns:mx="http://www.adobe.com/2006/mxml" xmlns="*" layout="absolute" cornerRadius="7" title="Video Manager" width="975" height="620" creationComplete="doInit()" horizontalScrollPolicy="off" verticalScrollPolicy="off" borderThicknessLeft="0" borderThicknessBottom="0" borderThicknessRight="0">
 <mx:Script>
 	<![CDATA[
       import mx.collections.ArrayCollection;
@@ -18,13 +18,31 @@
 	  [Bindable]
 	  private var bioInfo:ArrayCollection;
 	  
+	  [Bindable]
+	  private var tvUsers:ArrayCollection;
+	  
       private function doInit():void {
+      	var uArgs:Object = new Object;
+      	uArgs.gid = tvMaster.userInfo[0].gid;
+      	uArgs.uid = tvMaster.userInfo[0].uid;
+      	tvMaster.gateway.call("tuve.getUsers",new Responder(gotUsers,tvMaster.onFault),uArgs);
+      	uArgs = null;
+      	
         //bioGrid.selectedIndex = 0;
         bioSearch.text = bioData;
         findBio();
         }
-      private function findBio():void {
-      	tvMaster.gateway.call("tuve.getArtists",new Responder(gotArtists,tvMaster.onFault),bioSearch.text);      	
+      private function gotUsers(result:Array):void {
+      	if (result != null)
+      	  tvUsers = new ArrayCollection(result);
+        }        
+      public function findBio():void {
+      	var uArgs:Object = new Object;
+      	uArgs.gid = tvMaster.userInfo[0].gid;
+      	uArgs.uid = tvMaster.userInfo[0].uid;
+      	uArgs.skey = bioSearch.text;
+      	tvMaster.gateway.call("tuve.getArtists",new Responder(gotArtists,tvMaster.onFault),uArgs);
+      	uArgs = null;
         }
       
       private function gotArtists(result:Array):void {
@@ -48,7 +66,12 @@
       	  bioArtist.text = bioInfo[0].artist;
       	  bioThumb.source = bioInfo[0].photo;
       	  bioFile.text = bioInfo[0].photo;
-
+      	  for (i = 0;i < tvUsers.length;i++) {
+      	  	if (bioInfo[0].oid == tvUsers[i].uid) {
+      	  	  bioOwner.selectedIndex = i;
+      	  	  break;
+      	  	  }
+      	    }
       	  }
         }
       private function doUpdate():void {
@@ -56,8 +79,10 @@
     	newInfo.artist = bioArtist.text;
       	newInfo.aid    = bioInfo[0].aid;
       	newInfo.photo  = bioFile.text;
+      	newInfo.oid    = bioOwner.selectedItem.uid;
       	newInfo.description = bioDesc.htmlText;
       	tvMaster.gateway.call("tuve.updateArtist",new Responder(updateRes,tvMaster.onFault),newInfo);
+      	newInfo = null;
         }
       private function updateRes(result:String):void {
       	if (result == "0")
@@ -84,7 +109,7 @@
 <mx:Canvas width="100%" height="100%">
     <mx:Label text="Status:" />
     	<mx:Label id="vidStatus"  x="44" width="400"/>
-<mx:Form width="100%" height="500">
+<mx:Form width="100%" height="550">
 	<mx:FormItem label="Artist:">
 		<mx:TextInput width="600" id="bioArtist" />
 	</mx:FormItem>
@@ -96,9 +121,12 @@
 		<mx:TextInput width="600"  id="bioFile"/>
 	</mx:FormItem>
 	<mx:FormItem label="Bio:">
-		<mx:RichTextEditor width="640" height="275" id="bioDesc" >
+		<mx:RichTextEditor width="640" height="250" id="bioDesc" >
 		</mx:RichTextEditor>
 	</mx:FormItem>
+	<mx:FormItem label="Owner:">
+		<mx:ComboBox dataProvider="{tvUsers}" labelField="username" width="200" id="bioOwner" />
+	</mx:FormItem>
   </mx:Form>
  <mx:Button label="Update" click="doUpdate()" y="508" x="10"/>
   	<mx:Button label="Prev" click="doPrev()"  x="10" y="533"/>
diff --git a/newBio.mxml b/newBio.mxml
index 2a31bd3..4fa2392 100644
--- a/newBio.mxml
+++ b/newBio.mxml
@@ -5,9 +5,15 @@
 		public var tvMaster:Master;
 		
 		private function doNewArtist():void {
-          tvMaster.gateway.call("tuve.addArtist",new Responder(null,tvMaster.onFault),newArtist.text);
+		  var uArgs:Object = new Object;
+		  uArgs.artist = newArtist.text;
+		  uArgs.oid    = tvMaster.userInfo[0].uid;
+          tvMaster.gateway.call("tuve.addArtist",new Responder(null,tvMaster.onFault),uArgs);
+          uArgs = null;
 		  tvMaster.tuveShowBW(newArtist.text);
 		  tvMaster.tuveCloseNBW();
+		  if (tvMaster.tuveVW != null)
+		    tvMaster.tuveVW.getArtists();
 		  }
 	]]>
 </mx:Script>
diff --git a/videoWindow.mxml b/videoWindow.mxml
index 45c0a2d..bc09f9e 100644
--- a/videoWindow.mxml
+++ b/videoWindow.mxml
@@ -16,12 +16,41 @@
 	  [Bindable]
 	  private var vidInfo:ArrayCollection;
 	  
+	  [Bindable]
+	  private var tvUsers:ArrayCollection;
+	  
       private function doInit():void {
+      	var uArgs:Object = new Object;
+      	uArgs.gid = tvMaster.userInfo[0].gid;
+      	uArgs.uid = tvMaster.userInfo[0].uid;
+      	tvMaster.gateway.call("tuve.getUsers",new Responder(gotUsers,tvMaster.onFault),uArgs);
+      	uArgs = null;
         findVid();
         }
-      private function findVid():void {
-      	tvMaster.gateway.call("tuve.getArtists",new Responder(gotArtists,tvMaster.onFault),null);      	
-      	tvMaster.gateway.call("tuve.getVideos",new Responder(gotVideos,tvMaster.onFault),vidSearch.text);
+        
+        
+      private function gotUsers(result:Array):void {
+      	if (result != null)
+      	  tvUsers = new ArrayCollection(result);
+        }
+      public function findVid():void {
+      	var uArgs:Object = new Object;
+      	uArgs.gid = tvMaster.userInfo[0].gid;
+      	uArgs.uid = tvMaster.userInfo[0].uid;
+      	uArgs.skey = "";
+      	tvMaster.gateway.call("tuve.getArtists",new Responder(gotArtists,tvMaster.onFault),uArgs); 
+      	uArgs.skey = vidSearch.text;     	
+      	tvMaster.gateway.call("tuve.getVideos",new Responder(gotVideos,tvMaster.onFault),uArgs);
+      	uArgs = null;
+        }
+        
+      public function getArtists():void {
+      	var uArgs:Object = new Object;
+      	uArgs.gid = tvMaster.userInfo[0].gid;
+      	uArgs.uid = tvMaster.userInfo[0].uid;
+      	uArgs.skey = "";
+      	tvMaster.gateway.call("tuve.getArtists",new Responder(gotArtists,tvMaster.onFault),uArgs); 
+      	uArgs = null;
         }
       
       private function gotArtists(result:Array):void {
@@ -52,7 +81,7 @@
       	  vidTitle.text = vidInfo[0].title;
       	  vidGenre.text = vidInfo[0].genre;
       	  vidLength.text = vidInfo[0].length;
-      	  vidFile.text = vidInfo[0].file;
+      	  //vidFile.text = vidInfo[0].file;
       	  vidDesc.htmlText = "&nbsp;";
           vidDesc.htmlText = vidInfo[0].description;
       	  vidRes.text = vidInfo[0].width + "X" + vidInfo[0].height;
@@ -76,6 +105,12 @@
       	  	  break;
       	  	  }
       	    }
+      	  for (i = 0;i < tvUsers.length;i++) {
+      	  	if (vidInfo[0].oid == tvUsers[i].uid) {
+      	  	  vidOwner.selectedIndex = i;
+      	  	  break;
+      	  	  }
+      	    }
       	  }
         }
       private function doUpdate():void {
@@ -91,6 +126,7 @@
       	newInfo.vid    = vidInfo[0].vid;
       	newInfo.thumbFrame = genTime.text;
       	newInfo.description = vidDesc.htmlText;
+      	newInfo.oid         = vidOwner.selectedItem.uid;
       	tvMaster.gateway.call("tuve.updateVideo",new Responder(updateRes,tvMaster.onFault),newInfo);
         }
       private function updateRes(result:String):void {
@@ -160,8 +196,8 @@
 	<mx:FormItem label="Thumbnail:">
 		<mx:Image width="200" height="150" id="vidThumb"  scaleContent="true" maintainAspectRatio="true"/>
 	</mx:FormItem>
-	<mx:FormItem label="File">
-		<mx:TextInput width="350" editable="false" id="vidFile"/>
+	<mx:FormItem label="Owner">
+		<mx:ComboBox dataProvider="{tvUsers}" labelField="username" width="200" id="vidOwner" />
 	</mx:FormItem>
   </mx:Form>
   	<mx:Button x="10" y="420" label="Regen Thumb" click="regenThumb()" />