diff --git a/src/android/AndroidManifest.xml b/src/android/AndroidManifest.xml
index 565654745..a06f44831 100644
--- a/src/android/AndroidManifest.xml
+++ b/src/android/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.musikcube"
       android:versionName="1.0.5" android:versionCode="5">
-    <application android:icon="@drawable/icon" android:label="@string/app_name" android:name="App" android:debuggable="true">
+    <application android:icon="@drawable/icon" android:label="@string/app_name" android:name="App" android:debuggable="false">
         <activity android:name=".main"
                   android:label="@string/app_name" android:launchMode="singleTask" android:screenOrientation="portrait">
             <intent-filter>
@@ -18,6 +18,7 @@
 <activity android:name="NowPlayingList" android:launchMode="singleTask"></activity>
 <activity android:name="PlayerBPMControl" android:launchMode="singleTask" android:screenOrientation="portrait"></activity>
 <activity android:name="CategorySelect" android:launchMode="singleTask"></activity>
+<activity android:name="Search"></activity>
 </application>
     <uses-sdk android:minSdkVersion="3" />
 
diff --git a/src/android/res/layout/search.xml b/src/android/res/layout/search.xml
new file mode 100644
index 000000000..877e4636b
--- /dev/null
+++ b/src/android/res/layout/search.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/tabhost"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+        <TabWidget
+            android:id="@android:id/tabs"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content" />
+        <FrameLayout
+            android:id="@android:id/tabcontent"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+            <TextView 
+                android:id="@+id/tracks"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent" 
+                android:text="Tracks" />
+            <TextView 
+                android:id="@+id/artists"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent" 
+                android:text="Artists" />
+            <TextView 
+                android:id="@+id/albums"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent" 
+                android:text="Albums" />
+    	</FrameLayout>
+    </LinearLayout>
+</TabHost>
\ No newline at end of file
diff --git a/src/android/res/menu/default_menu.xml b/src/android/res/menu/default_menu.xml
index 93251af18..ca7bdd2af 100644
--- a/src/android/res/menu/default_menu.xml
+++ b/src/android/res/menu/default_menu.xml
@@ -4,4 +4,5 @@
 <item android:title="@string/menu_settings" android:id="@+id/context_settings" android:enabled="true" android:visible="true" android:icon="@drawable/ic_menu_preferences"></item>
 <item android:id="@+id/context_nowplaying" android:title="@string/menu_nowplaying" android:icon="@drawable/ic_menu_nowplaying"></item>
 <item android:id="@+id/context_help" android:title="@string/menu_help" android:icon="@drawable/ic_menu_help"></item>
+<item android:id="@+id/context_search" android:title="@string/menu_search"></item>
 </menu>
diff --git a/src/android/res/values/strings.xml b/src/android/res/values/strings.xml
index 206169a07..ea1c092de 100644
--- a/src/android/res/values/strings.xml
+++ b/src/android/res/values/strings.xml
@@ -21,4 +21,5 @@
 <string name="menu_nowplaying">Now playing</string>
 <string name="help_main">musikCube is a application that connects to your musikServer that you have installed on your desktop/server computer. The musikServer can be downloaded from http://code.google.com/p/musikcube/\nOnce musikCube is connected you are able to browse and play all your music directly on your phone without having to copy them to you SD card.\n</string>
 
+<string name="menu_search">Search</string>
 </resources>
diff --git a/src/android/src/doep/xml/Reader.java b/src/android/src/doep/xml/Reader.java
index 411defd35..52c319a7b 100644
--- a/src/android/src/doep/xml/Reader.java
+++ b/src/android/src/doep/xml/Reader.java
@@ -37,11 +37,12 @@ public final class Reader extends ReaderNode {
 		throws Exception
 	{
 		int eventType	= 0;
+		final XmlPullParser parser	= this.parser;
 		if(this.firstParse){
 			this.firstParse	= false;
-			eventType = this.parser.getEventType();
+			eventType = parser.getEventType();
 		}else{
-			eventType = this.parser.next();
+			eventType = parser.next();
 		}
 			
 //        while (eventType != XmlPullParser.END_DOCUMENT) {
@@ -61,12 +62,12 @@ public final class Reader extends ReaderNode {
 				//Log.v("doep::Reader::Parse","Start tag "+this.parser.getName());
 			    //System.out.println("Start tag "+xpp.getName());
 				// Start a new node
-				ReaderNode node	= new ReaderNode(this.parser.getName(),this.nodeLevels.getLast());
+				ReaderNode node	= new ReaderNode(parser.getName(),this.nodeLevels.getLast());
 				
 				// Get the attributes
-				int attributes	= this.parser.getAttributeCount();
+				int attributes	= parser.getAttributeCount();
 				for(int i=0;i<attributes;i++){
-					node.attributes.put(this.parser.getAttributeName(i),this.parser.getAttributeValue(i));
+					node.attributes.put(parser.getAttributeName(i),parser.getAttributeValue(i));
 				}
 				
 				// Add to the end of the levels
@@ -78,7 +79,7 @@ public final class Reader extends ReaderNode {
 			} else if(eventType == XmlPullParser.END_TAG) {
 				//Log.v("doep::Reader::Parse","End tag "+this.parser.getName());
 			    //System.out.println("End tag "+xpp.getName());
-				if(this.parser.getName().equals(this.currentNode.name)){
+				if(parser.getName().equals(this.currentNode.name)){
 					// End the node, and remove from levels
 					this.currentNode.ended	= true;
 					this.nodeLevels.removeLast();
@@ -90,7 +91,7 @@ public final class Reader extends ReaderNode {
 			} else if(eventType == XmlPullParser.TEXT) {
 				//Log.v("doep::Reader::Parse","Text "+this.parser.getText());
 			    //System.out.println("Text "+xpp.getText());
-				this.currentNode.content	+= this.parser.getText();
+				this.currentNode.content	+= parser.getText();
 			}
 //        }
 	}
diff --git a/src/android/src/doep/xml/ReaderNode.java b/src/android/src/doep/xml/ReaderNode.java
index d0fc711c0..8cf548ea0 100644
--- a/src/android/src/doep/xml/ReaderNode.java
+++ b/src/android/src/doep/xml/ReaderNode.java
@@ -41,18 +41,19 @@ public class ReaderNode {
 		// Check if this is the current node, if not - lets wait for it to bee
 		while(!this.ended){
 			this.reader.Parse();
+			final ReaderNode currentNode	=  this.reader.currentNode;
 			//Log.v("doep::ReaderNode::ChildNode1","Node: "+this.reader.currentNode.level+" "+this.level);
-			if(this.reader.currentNode.level==this.level+1){
+			if(currentNode.level==this.level+1){
 				// We have a childnode
 				//Log.v("doep::ReaderNode::ChildNode2",""+this.reader.currentNode.name+"=="+name);
-				if(this.reader.currentNode.name.equals(name)){
+				if(currentNode.name.equals(name)){
 					//Log.v("doep::ReaderNode::ChildNode3","FOUND "+this.reader.currentNode.name);
-					return this.reader.currentNode;
+					return currentNode;
 				}else{
-					this.reader.currentNode.End();
+					currentNode.End();
 				}
-			}else if( this.reader.currentNode.level>this.level+1){
-				this.reader.currentNode.End();
+			}else if( currentNode.level>this.level+1){
+				currentNode.End();
 			}
 		}
 		//Log.v("doep::ReaderNode::ChildNode4","NOT FOUND "+name);
@@ -78,14 +79,16 @@ public class ReaderNode {
 	{
 		while(!this.ended){
 			this.reader.Parse();
-			if(this.reader.currentNode.level==this.level+1){
+			final ReaderNode currentNode	=  this.reader.currentNode;
+			if(currentNode.level==this.level+1){
 				// We have a childnode
-				return this.reader.currentNode;
-			}else if( this.reader.currentNode.level>this.level+1){
-				this.reader.currentNode.End();
+				return currentNode;
+			}else if( currentNode.level>this.level+1){
+				currentNode.End();
 			}
 		}
 		return null;
 	}
+
 	
 }
diff --git a/src/android/src/doep/xml/WriterNode.java b/src/android/src/doep/xml/WriterNode.java
index e2bf6c9f3..7b8931804 100644
--- a/src/android/src/doep/xml/WriterNode.java
+++ b/src/android/src/doep/xml/WriterNode.java
@@ -15,14 +15,14 @@ public class WriterNode {
 	
 	protected WriterNode(String name,WriterNode parent){
 		this.name	= name;
+		this.parent	= parent;
 		if(parent!=null){
-			this.parent	= parent;
 			this.writer	= parent.writer;
 		}
 	}
 	
-	public WriterNode ChildNode(String name){
-		WriterNode newNode	= new WriterNode(name,this);
+	public final WriterNode ChildNode(String name){
+		final WriterNode newNode	= new WriterNode(name,this);
 		this.children.add(newNode);
 		return newNode;
 	}
diff --git a/src/android/src/org/musikcube/Search.java b/src/android/src/org/musikcube/Search.java
new file mode 100644
index 000000000..7f1898ee8
--- /dev/null
+++ b/src/android/src/org/musikcube/Search.java
@@ -0,0 +1,24 @@
+package org.musikcube;
+
+import android.app.TabActivity;
+import android.os.Bundle;
+import android.widget.Button;
+import android.widget.TabHost;
+
+public class Search extends TabActivity {
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.search);
+
+        TabHost mTabHost = getTabHost();
+        
+        mTabHost.addTab(mTabHost.newTabSpec("tab_test1").setIndicator("Tracks").setContent(R.id.tracks));
+        mTabHost.addTab(mTabHost.newTabSpec("tab_test2").setIndicator("Artists").setContent(R.id.artists));
+        mTabHost.addTab(mTabHost.newTabSpec("tab_test3").setIndicator("Albums").setContent(R.id.albums));
+        
+        mTabHost.setCurrentTab(0);        
+    }
+
+}
diff --git a/src/android/src/org/musikcube/core/TrackPlayer.java b/src/android/src/org/musikcube/core/TrackPlayer.java
index d0181eff0..d11e05912 100644
--- a/src/android/src/org/musikcube/core/TrackPlayer.java
+++ b/src/android/src/org/musikcube/core/TrackPlayer.java
@@ -25,10 +25,10 @@ public class TrackPlayer implements Runnable, MediaPlayer.OnCompletionListener,
 			this.mediaPlayer	= new MediaPlayer();
 		}
 		try {
-			
-			this.mediaPlayer.setOnCompletionListener(this);
-			this.mediaPlayer.setOnErrorListener(this);
-			this.mediaPlayer.setOnBufferingUpdateListener(this);
+			MediaPlayer mP	 = this.mediaPlayer; 
+			mP.setOnCompletionListener(this);
+			mP.setOnErrorListener(this);
+			mP.setOnBufferingUpdateListener(this);
 				
 			String url	= Library.GetInstance().GetTrackURL(this.trackId);
 			synchronized(this.lock){
@@ -43,8 +43,8 @@ public class TrackPlayer implements Runnable, MediaPlayer.OnCompletionListener,
 					this.status	= STATUS_EXIT;
 				}
 			}else{
-				this.mediaPlayer.setDataSource(url);
-				this.mediaPlayer.prepare();
+				mP.setDataSource(url);
+				mP.prepare();
 			}
 			
 			synchronized(this.lock){
@@ -62,7 +62,7 @@ public class TrackPlayer implements Runnable, MediaPlayer.OnCompletionListener,
 			}
 			
 			if(currentStatus==STATUS_PLAYING)
-				this.mediaPlayer.start();
+				mP.start();
 
 		
 			synchronized(this.lock){
@@ -70,8 +70,8 @@ public class TrackPlayer implements Runnable, MediaPlayer.OnCompletionListener,
 				
 				while(this.status==STATUS_PLAYING){
 					if(!this.almostDoneSend){
-						int duration	= this.mediaPlayer.getDuration();
-						int position	= this.mediaPlayer.getCurrentPosition();
+						int duration	= mP.getDuration();
+						int position	= mP.getCurrentPosition();
 						if(duration>0 && position+10000>duration){
 							// The track is almost done
 							this.almostDoneSend	= true;
@@ -87,10 +87,11 @@ public class TrackPlayer implements Runnable, MediaPlayer.OnCompletionListener,
 			}
 
 			
-			this.mediaPlayer.stop();
-			this.mediaPlayer.release();
+			mP.stop();
+			mP.release();
 			synchronized(this.lock){
 				this.mediaPlayer	= null;
+				mP	= null;
 			}