diff --git a/model/model.ecore b/model/model.ecore
index aee5938..31b0b8e 100644
--- a/model/model.ecore
+++ b/model/model.ecore
@@ -7,40 +7,23 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="author" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="created" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="EReference0" lowerBound="1"
-        upperBound="-1" eType="#//Comment" containment="true"/>
+        upperBound="-1" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="permalink" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="EReference1" upperBound="-1"
-        eType="#//Image"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="EReference1" upperBound="-1"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="EReference2" upperBound="-1"
-        eType="#//Reply"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="EReference2" upperBound="-1"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="is_male" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Image">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="url" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Comment">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="post_title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="post_permalink" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="comment_id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="author" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body_html" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="likes" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="ups" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="downs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="created" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="EReference0" upperBound="-1"
-        eType="#//Image" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body_html" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="EReference1" upperBound="-1"
-        eType="#//Reply" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Reply">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="author"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ups"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="downs"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="created"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body_html"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="EReference0" upperBound="-1"
-        eType="#//Reply" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="parentIdentifier"/>
   </eClassifiers>
 </ecore:EPackage>
diff --git a/model/model.ecorediag b/model/model.ecorediag
index a4b9193..ee176b0 100644
--- a/model/model.ecorediag
+++ b/model/model.ecorediag
@@ -44,6 +44,62 @@
     <element xmi:type="ecore:EClass" href="model.ecore#//Post"/>
     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JspSkkaSEeOAhZ6b1CwEtg" x="187" y="167"/>
   </children>
+  <children xmi:type="notation:Node" xmi:id="_rzLHcG2sEeOKsMm8Ky715g" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_rzLHc22sEeOKsMm8Ky715g" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_rzLugG2sEeOKsMm8Ky715g" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_ubnJUG2sEeOKsMm8Ky715g" type="2001">
+        <element xmi:type="ecore:EAttribute" href="model.ecore#//Comment/post_title"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ubnJUW2sEeOKsMm8Ky715g"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="__jBYYG27EeOKsMm8Ky715g" type="2001">
+        <element xmi:type="ecore:EAttribute" href="model.ecore#//Comment/post_permalink"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__jBYYW27EeOKsMm8Ky715g"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_vINwoG2sEeOKsMm8Ky715g" type="2001">
+        <element xmi:type="ecore:EAttribute" href="model.ecore#//Comment/comment_id"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_vINwoW2sEeOKsMm8Ky715g"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_vweqgG2sEeOKsMm8Ky715g" type="2001">
+        <element xmi:type="ecore:EAttribute" href="model.ecore#//Comment/author"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_vweqgW2sEeOKsMm8Ky715g"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_wTLu8G2sEeOKsMm8Ky715g" type="2001">
+        <element xmi:type="ecore:EAttribute" href="model.ecore#//Comment/body_html"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_wTLu8W2sEeOKsMm8Ky715g"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_w3LM0G2sEeOKsMm8Ky715g" type="2001">
+        <element xmi:type="ecore:EAttribute" href="model.ecore#//Comment/name"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_w3LM0W2sEeOKsMm8Ky715g"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_xhbDsG2sEeOKsMm8Ky715g" type="2001">
+        <element xmi:type="ecore:EAttribute" href="model.ecore#//Comment/likes"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xhbDsW2sEeOKsMm8Ky715g"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_x69lEG2sEeOKsMm8Ky715g" type="2001">
+        <element xmi:type="ecore:EAttribute" href="model.ecore#//Comment/ups"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_x69lEW2sEeOKsMm8Ky715g"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_yPoNgG2sEeOKsMm8Ky715g" type="2001">
+        <element xmi:type="ecore:EAttribute" href="model.ecore#//Comment/downs"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_yPoNgW2sEeOKsMm8Ky715g"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_6G_tMG2-EeOKsMm8Ky715g" type="2001">
+        <element xmi:type="ecore:EAttribute" href="model.ecore#//Comment/created"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6G_tMW2-EeOKsMm8Ky715g"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_rzLugW2sEeOKsMm8Ky715g"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_rzLugm2sEeOKsMm8Ky715g"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_rzLug22sEeOKsMm8Ky715g"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_rzLuhG2sEeOKsMm8Ky715g" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_rzLuhW2sEeOKsMm8Ky715g"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_rzLuhm2sEeOKsMm8Ky715g"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_rzLuh22sEeOKsMm8Ky715g"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_rzLHcW2sEeOKsMm8Ky715g" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="model.ecore#//Comment"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rzLHcm2sEeOKsMm8Ky715g" x="566" y="310"/>
+  </children>
   <styles xmi:type="notation:DiagramStyle" xmi:id="_bHOQIOqPEd-cf4p1YNxwtA"/>
   <element xmi:type="ecore:EPackage" href="model.ecore#/"/>
 </notation:Diagram>
diff --git a/res/layout/fragment_comment.xml b/res/layout/fragment_comment.xml
index 6a5c33e..08b2ec6 100644
--- a/res/layout/fragment_comment.xml
+++ b/res/layout/fragment_comment.xml
@@ -1,70 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/vf"
+    android:id="@+id/root_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="wrap_content" >
 
-    <ProgressBar
-        android:id="@+id/loading"
-        style="@android:style/Widget.ProgressBar.Small"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center" />
-
-    <RelativeLayout
+    <ListView
+        android:id="@+id/replies_lv"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:divider="@null"
+        android:dividerHeight="0dp"
+        android:listSelector="@android:color/transparent"
+        android:paddingBottom="50dp" >
+    </ListView>
+
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:background="#e6d7d4d3"
+        android:orientation="vertical" >
 
-        <ListView
-            android:id="@+id/replies_lv"
+        <View
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:divider="@null"
-            android:listSelector="@android:color/transparent"
-            android:dividerHeight="0dp"
-            android:paddingBottom="50dp" >
-        </ListView>
+            android:layout_height="2px"
+            android:background="@color/orange" />
 
-        <LinearLayout
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:background="#e6d7d4d3"
-            android:orientation="vertical" >
-
-            <View
+            android:layout_height="match_parent" >
+
+            <ImageView
+                android:id="@+id/comment_reply_send_btn"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_margin="10dp"
+                android:clickable="true"
+                android:src="@android:drawable/ic_menu_send" />
+
+            <com.sobremesa.waywt.views.WaywtSecondaryEditText
+                android:id="@+id/comment_reply_et"
                 android:layout_width="match_parent"
-                android:layout_height="2px"
-                android:background="@color/orange" />
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" >
-
-                <ImageView
-                    android:id="@+id/comment_reply_send_btn"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:layout_margin="10dp"
-                    android:clickable="true"
-                    android:src="@android:drawable/ic_menu_send" />
-
-                <com.sobremesa.waywt.views.WaywtSecondaryEditText
-                    android:id="@+id/comment_reply_et"
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    android:layout_centerVertical="true"
-                    android:layout_marginBottom="10dp"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginTop="10dp"
-                    android:layout_toLeftOf="@id/comment_reply_send_btn"
-                    android:hint="Type comment"
-                    android:textColor="@color/black" />
-            </RelativeLayout>
-        </LinearLayout>
-    </RelativeLayout>
-
-</ViewFlipper>
\ No newline at end of file
+                android:layout_height="40dp"
+                android:layout_centerVertical="true"
+                android:layout_marginBottom="10dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_toLeftOf="@id/comment_reply_send_btn"
+                android:hint="Type comment"
+                android:textColor="@color/black" />
+        </RelativeLayout>
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/fragment_my_posts.xml b/res/layout/fragment_my_posts.xml
new file mode 100644
index 0000000..04c64b6
--- /dev/null
+++ b/res/layout/fragment_my_posts.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res/com.sobremesa.waywt"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <com.viewpagerindicator.TitlePageIndicator
+        android:id="@+id/page_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top"
+        android:background="@android:color/black"
+        app:footerColor="@color/orange" />
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/fragment_waywt.xml b/res/layout/fragment_waywt.xml
index 4f4bd1b..04c64b6 100644
--- a/res/layout/fragment_waywt.xml
+++ b/res/layout/fragment_waywt.xml
@@ -1,34 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/vf"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res/com.sobremesa.waywt"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res/com.sobremesa.waywt">
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
 
-    <ProgressBar
-        android:id="@+id/loading"
-        style="@android:style/Widget.ProgressBar.Small"
+    <com.viewpagerindicator.TitlePageIndicator
+        android:id="@+id/page_indicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center" />
+        android:layout_gravity="top"
+        android:background="@android:color/black"
+        app:footerColor="@color/orange" />
 
-    <LinearLayout
+    <android.support.v4.view.ViewPager
+        android:id="@+id/pager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical" >
+        android:layout_height="wrap_content" />
 
-        <com.viewpagerindicator.TitlePageIndicator
-            android:id="@+id/page_indicator"
-            android:layout_width="wrap_content"
-            app:footerColor="@color/orange"
-            
-            android:layout_height="wrap_content"
-            android:layout_gravity="top"
-            android:background="@android:color/black" /> 
-
-        <android.support.v4.view.ViewPager
-            android:id="@+id/pager"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-    </LinearLayout>
-
-</ViewFlipper>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/res/menu/waywt.xml b/res/menu/waywt.xml
index b4dbbea..d83e20d 100644
--- a/res/menu/waywt.xml
+++ b/res/menu/waywt.xml
@@ -10,12 +10,12 @@
         android:icon="@drawable/ic_action_refresh"
         android:orderInCategory="1"
         android:showAsAction="always"
-        android:title="refresh"
-        android:visible="false"/>
+        android:title="refresh"/>
     <item
         android:id="@+id/loading_menu_id"
         android:orderInCategory="1"
-        android:showAsAction="always"/>
+        android:showAsAction="always"
+        android:visible="false"/>
     <!--
          <item
         android:id="@+id/login_menu_id"
diff --git a/src-gen/ContentProvider.xml b/src-gen/ContentProvider.xml
new file mode 100644
index 0000000..2f499bd
--- /dev/null
+++ b/src-gen/ContentProvider.xml
@@ -0,0 +1,4 @@
+Copy this code snippet in your AndroidManifest.xml inside the <application> element to activate the content provider
+	
+<provider android:name="com.sobremesa.waywt.contentprovider.Provider" android:authorities="com.sobremesa.waywt.provider.Model" />
+	
\ No newline at end of file
diff --git a/src-gen/com/sobremesa/waywt/contentprovider/Provider.java b/src-gen/com/sobremesa/waywt/contentprovider/Provider.java
index bfd7d24..08206ed 100644
--- a/src-gen/com/sobremesa/waywt/contentprovider/Provider.java
+++ b/src-gen/com/sobremesa/waywt/contentprovider/Provider.java
@@ -29,7 +29,7 @@
  * Generated Class. Do not modify!
  * 
  * @author MDSDACP Team - goetzfred@fh-bingen.de 
- * @date 2013.12.01
+ * @date 2013.12.25
  */
 public class Provider extends ContentProvider {
 	private static final String TAG = "com.sobremesa.waywt.contentprovider.Provider";
@@ -40,41 +40,25 @@ public class Provider extends ContentProvider {
 	public static final Uri POST_CONTENT_URI = Uri.withAppendedPath(
 			Provider.AUTHORITY_URI, PostContent.CONTENT_PATH);
 
-	public static final Uri IMAGE_CONTENT_URI = Uri.withAppendedPath(
-			Provider.AUTHORITY_URI, ImageContent.CONTENT_PATH);
-
 	public static final Uri COMMENT_CONTENT_URI = Uri.withAppendedPath(
 			Provider.AUTHORITY_URI, CommentContent.CONTENT_PATH);
 
-	public static final Uri REPLY_CONTENT_URI = Uri.withAppendedPath(
-			Provider.AUTHORITY_URI, ReplyContent.CONTENT_PATH);
-
 	private static final UriMatcher URI_MATCHER;
 
 	private Database db;
 
 	private static final int POST_DIR = 0;
 	private static final int POST_ID = 1;
-	private static final int IMAGE_DIR = 2;
-	private static final int IMAGE_ID = 3;
-	private static final int COMMENT_DIR = 4;
-	private static final int COMMENT_ID = 5;
-	private static final int REPLY_DIR = 6;
-	private static final int REPLY_ID = 7;
+	private static final int COMMENT_DIR = 2;
+	private static final int COMMENT_ID = 3;
 
 	static {
 		URI_MATCHER = new UriMatcher(UriMatcher.NO_MATCH);
 		URI_MATCHER.addURI(AUTHORITY, PostContent.CONTENT_PATH, POST_DIR);
 		URI_MATCHER.addURI(AUTHORITY, PostContent.CONTENT_PATH + "/#", POST_ID);
-		URI_MATCHER.addURI(AUTHORITY, ImageContent.CONTENT_PATH, IMAGE_DIR);
-		URI_MATCHER.addURI(AUTHORITY, ImageContent.CONTENT_PATH + "/#",
-				IMAGE_ID);
 		URI_MATCHER.addURI(AUTHORITY, CommentContent.CONTENT_PATH, COMMENT_DIR);
 		URI_MATCHER.addURI(AUTHORITY, CommentContent.CONTENT_PATH + "/#",
 				COMMENT_ID);
-		URI_MATCHER.addURI(AUTHORITY, ReplyContent.CONTENT_PATH, REPLY_DIR);
-		URI_MATCHER.addURI(AUTHORITY, ReplyContent.CONTENT_PATH + "/#",
-				REPLY_ID);
 	}
 
 	/**
@@ -104,33 +88,6 @@ public static final class PostContent implements BaseColumns {
 		public static final String[] ALL_COLUMNS = PostTable.ALL_COLUMNS;
 	}
 
-	/**
-	 * Provides the content information of the ImageTable.
-	 * 
-	 * CONTENT_PATH: image (String)
-	 * CONTENT_TYPE: vnd.android.cursor.dir/vnd.mdsdacp.image (String)
-	 * CONTENT_ITEM_TYPE: vnd.android.cursor.item/vnd.mdsdacp.image (String)
-	 * ALL_COLUMNS: Provides the same information as ImageTable.ALL_COLUMNS (String[])
-	 */
-	public static final class ImageContent implements BaseColumns {
-		/**
-		 * Specifies the content path of the ImageTable for the required uri
-		 * Exact URI: content://com.sobremesa.waywt.provider.Model/image
-		 */
-		public static final String CONTENT_PATH = "image";
-
-		/**
-		 * Specifies the type for the folder and the single item of the ImageTable  
-		 */
-		public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.mdsdacp.image";
-		public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.mdsdacp.image";
-
-		/**
-		 * Contains all columns of the ImageTable
-		 */
-		public static final String[] ALL_COLUMNS = ImageTable.ALL_COLUMNS;
-	}
-
 	/**
 	 * Provides the content information of the CommentTable.
 	 * 
@@ -158,33 +115,6 @@ public static final class CommentContent implements BaseColumns {
 		public static final String[] ALL_COLUMNS = CommentTable.ALL_COLUMNS;
 	}
 
-	/**
-	 * Provides the content information of the ReplyTable.
-	 * 
-	 * CONTENT_PATH: reply (String)
-	 * CONTENT_TYPE: vnd.android.cursor.dir/vnd.mdsdacp.reply (String)
-	 * CONTENT_ITEM_TYPE: vnd.android.cursor.item/vnd.mdsdacp.reply (String)
-	 * ALL_COLUMNS: Provides the same information as ReplyTable.ALL_COLUMNS (String[])
-	 */
-	public static final class ReplyContent implements BaseColumns {
-		/**
-		 * Specifies the content path of the ReplyTable for the required uri
-		 * Exact URI: content://com.sobremesa.waywt.provider.Model/reply
-		 */
-		public static final String CONTENT_PATH = "reply";
-
-		/**
-		 * Specifies the type for the folder and the single item of the ReplyTable  
-		 */
-		public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.mdsdacp.reply";
-		public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.mdsdacp.reply";
-
-		/**
-		 * Contains all columns of the ReplyTable
-		 */
-		public static final String[] ALL_COLUMNS = ReplyTable.ALL_COLUMNS;
-	}
-
 	/**
 	 * Instantiate the database, when the content provider is created
 	 */
@@ -209,18 +139,10 @@ public final String getType(final Uri uri) {
 				return PostContent.CONTENT_TYPE;
 			case POST_ID :
 				return PostContent.CONTENT_ITEM_TYPE;
-			case IMAGE_DIR :
-				return ImageContent.CONTENT_TYPE;
-			case IMAGE_ID :
-				return ImageContent.CONTENT_ITEM_TYPE;
 			case COMMENT_DIR :
 				return CommentContent.CONTENT_TYPE;
 			case COMMENT_ID :
 				return CommentContent.CONTENT_ITEM_TYPE;
-			case REPLY_DIR :
-				return ReplyContent.CONTENT_TYPE;
-			case REPLY_ID :
-				return ReplyContent.CONTENT_ITEM_TYPE;
 			default :
 				throw new IllegalArgumentException("Unsupported URI: " + uri);
 		}
@@ -253,16 +175,6 @@ public final Uri insert(final Uri uri, final ContentValues values) {
 							null);
 					dbConnection.setTransactionSuccessful();
 					return newPost;
-				case IMAGE_DIR :
-				case IMAGE_ID :
-					final long imageid = dbConnection.insertOrThrow(
-							ImageTable.TABLE_NAME, null, values);
-					final Uri newImage = ContentUris.withAppendedId(
-							IMAGE_CONTENT_URI, imageid);
-					getContext().getContentResolver().notifyChange(newImage,
-							null);
-					dbConnection.setTransactionSuccessful();
-					return newImage;
 				case COMMENT_DIR :
 				case COMMENT_ID :
 					final long commentid = dbConnection.insertOrThrow(
@@ -273,16 +185,6 @@ public final Uri insert(final Uri uri, final ContentValues values) {
 							null);
 					dbConnection.setTransactionSuccessful();
 					return newComment;
-				case REPLY_DIR :
-				case REPLY_ID :
-					final long replyid = dbConnection.insertOrThrow(
-							ReplyTable.TABLE_NAME, null, values);
-					final Uri newReply = ContentUris.withAppendedId(
-							REPLY_CONTENT_URI, replyid);
-					getContext().getContentResolver().notifyChange(newReply,
-							null);
-					dbConnection.setTransactionSuccessful();
-					return newReply;
 				default :
 					throw new IllegalArgumentException("Unsupported URI:" + uri);
 			}
@@ -337,26 +239,6 @@ public final int update(final Uri uri, final ContentValues values,
 					dbConnection.setTransactionSuccessful();
 					break;
 
-				case IMAGE_DIR :
-					updateCount = dbConnection.update(ImageTable.TABLE_NAME,
-							values, selection, selectionArgs);
-					dbConnection.setTransactionSuccessful();
-					break;
-				case IMAGE_ID :
-					final Long imageId = ContentUris.parseId(uri);
-					updateCount = dbConnection.update(
-							ImageTable.TABLE_NAME,
-							values,
-							ImageTable.ID
-									+ "="
-									+ imageId
-									+ (TextUtils.isEmpty(selection)
-											? ""
-											: " AND (" + selection + ")"),
-							selectionArgs);
-					dbConnection.setTransactionSuccessful();
-					break;
-
 				case COMMENT_DIR :
 					updateCount = dbConnection.update(CommentTable.TABLE_NAME,
 							values, selection, selectionArgs);
@@ -374,26 +256,6 @@ public final int update(final Uri uri, final ContentValues values,
 							selectionArgs);
 					dbConnection.setTransactionSuccessful();
 					break;
-
-				case REPLY_DIR :
-					updateCount = dbConnection.update(ReplyTable.TABLE_NAME,
-							values, selection, selectionArgs);
-					dbConnection.setTransactionSuccessful();
-					break;
-				case REPLY_ID :
-					final Long replyId = ContentUris.parseId(uri);
-					updateCount = dbConnection.update(
-							ReplyTable.TABLE_NAME,
-							values,
-							ReplyTable.ID
-									+ "="
-									+ replyId
-									+ (TextUtils.isEmpty(selection)
-											? ""
-											: " AND (" + selection + ")"),
-							selectionArgs);
-					dbConnection.setTransactionSuccessful();
-					break;
 				default :
 					throw new IllegalArgumentException("Unsupported URI:" + uri);
 			}
@@ -440,17 +302,6 @@ public final int delete(final Uri uri, final String selection,
 									.getPathSegments().get(1)});
 					dbConnection.setTransactionSuccessful();
 					break;
-				case IMAGE_DIR :
-					deleteCount = dbConnection.delete(ImageTable.TABLE_NAME,
-							selection, selectionArgs);
-					dbConnection.setTransactionSuccessful();
-					break;
-				case IMAGE_ID :
-					deleteCount = dbConnection.delete(ImageTable.TABLE_NAME,
-							ImageTable.WHERE_ID_EQUALS, new String[]{uri
-									.getPathSegments().get(1)});
-					dbConnection.setTransactionSuccessful();
-					break;
 				case COMMENT_DIR :
 					deleteCount = dbConnection.delete(CommentTable.TABLE_NAME,
 							selection, selectionArgs);
@@ -462,17 +313,6 @@ public final int delete(final Uri uri, final String selection,
 									.getPathSegments().get(1)});
 					dbConnection.setTransactionSuccessful();
 					break;
-				case REPLY_DIR :
-					deleteCount = dbConnection.delete(ReplyTable.TABLE_NAME,
-							selection, selectionArgs);
-					dbConnection.setTransactionSuccessful();
-					break;
-				case REPLY_ID :
-					deleteCount = dbConnection.delete(ReplyTable.TABLE_NAME,
-							ReplyTable.WHERE_ID_EQUALS, new String[]{uri
-									.getPathSegments().get(1)});
-					dbConnection.setTransactionSuccessful();
-					break;
 
 				default :
 					throw new IllegalArgumentException("Unsupported URI:" + uri);
@@ -515,24 +355,12 @@ public final Cursor query(final Uri uri, final String[] projection,
 			case POST_DIR :
 				queryBuilder.setTables(PostTable.TABLE_NAME);
 				break;
-			case IMAGE_ID :
-				queryBuilder.appendWhere(ImageTable.ID + "="
-						+ uri.getPathSegments().get(1));
-			case IMAGE_DIR :
-				queryBuilder.setTables(ImageTable.TABLE_NAME);
-				break;
 			case COMMENT_ID :
 				queryBuilder.appendWhere(CommentTable.ID + "="
 						+ uri.getPathSegments().get(1));
 			case COMMENT_DIR :
 				queryBuilder.setTables(CommentTable.TABLE_NAME);
 				break;
-			case REPLY_ID :
-				queryBuilder.appendWhere(ReplyTable.ID + "="
-						+ uri.getPathSegments().get(1));
-			case REPLY_DIR :
-				queryBuilder.setTables(ReplyTable.TABLE_NAME);
-				break;
 			default :
 				throw new IllegalArgumentException("Unsupported URI:" + uri);
 		}
diff --git a/src-gen/com/sobremesa/waywt/database/Database.java b/src-gen/com/sobremesa/waywt/database/Database.java
index d94bc10..7fc5438 100644
--- a/src-gen/com/sobremesa/waywt/database/Database.java
+++ b/src-gen/com/sobremesa/waywt/database/Database.java
@@ -5,9 +5,7 @@
 import android.database.sqlite.SQLiteOpenHelper;
 
 import com.sobremesa.waywt.database.tables.PostTable;
-import com.sobremesa.waywt.database.tables.ImageTable;
 import com.sobremesa.waywt.database.tables.CommentTable;
-import com.sobremesa.waywt.database.tables.ReplyTable;
 
 /**
  * This database class extends the SQLiteOpenHelper
@@ -23,11 +21,11 @@
  * Generated Class. Do not modify!
  * 
  * @author MDSDACP Team - goetzfred@fh-bingen.de 
- * @date 2013.12.01
+ * @date 2013.12.25
  */
 public class Database extends SQLiteOpenHelper {
 	private static final String DATABASE_NAME = "mdsdacpdatabase.db";
-	private static final int DATABASE_VERSION = 18;
+	private static final int DATABASE_VERSION = 7;
 
 	public Database(final Context context) {
 		super(context, DATABASE_NAME, null, DATABASE_VERSION);
@@ -36,9 +34,7 @@ public Database(final Context context) {
 	@Override
 	public final void onCreate(final SQLiteDatabase db) {
 		db.execSQL(PostTable.SQL_CREATE);
-		db.execSQL(ImageTable.SQL_CREATE);
 		db.execSQL(CommentTable.SQL_CREATE);
-		db.execSQL(ReplyTable.SQL_CREATE);
 	}
 
 	@Override
@@ -57,9 +53,7 @@ public final void onUpgrade(final SQLiteDatabase db, final int oldVersion,
 	 */
 	private final void onUpgradeDropTablesAndCreate(final SQLiteDatabase db) {
 		db.execSQL(PostTable.SQL_DROP);
-		db.execSQL(ImageTable.SQL_DROP);
 		db.execSQL(CommentTable.SQL_DROP);
-		db.execSQL(ReplyTable.SQL_DROP);
 		onCreate(db);
 	}
 }
diff --git a/src-gen/com/sobremesa/waywt/database/tables/CommentTable.java b/src-gen/com/sobremesa/waywt/database/tables/CommentTable.java
index 5787a2f..f70b795 100644
--- a/src-gen/com/sobremesa/waywt/database/tables/CommentTable.java
+++ b/src-gen/com/sobremesa/waywt/database/tables/CommentTable.java
@@ -7,32 +7,37 @@
  * Generated Class. Do not modify!
  * 
  * @author MDSDACP Team - goetzfred@fh-bingen.de 
- * @date 2013.12.01
+ * @date 2013.12.25
  */
 public interface CommentTable {
 	String TABLE_NAME = "comment";
 
 	String ID = "_id";
+	String POST_TITLE = "post_title";
+	String POST_PERMALINK = "post_permalink";
+	String COMMENT_ID = "comment_id";
 	String AUTHOR = "author";
+	String BODY_HTML = "body_html";
+	String NAME = "name";
+	String LIKES = "likes";
 	String UPS = "ups";
 	String DOWNS = "downs";
 	String CREATED = "created";
-	String BODY_HTML = "body_html";
-	String IDENTIFIER = "identifier";
-	String POST_ID = "postid";
 
-	String[] ALL_COLUMNS = new String[]{ID, AUTHOR, UPS, DOWNS, CREATED,
-			BODY_HTML, IDENTIFIER, POST_ID};
+	String[] ALL_COLUMNS = new String[]{ID, POST_TITLE, POST_PERMALINK,
+			COMMENT_ID, AUTHOR, BODY_HTML, NAME, LIKES, UPS, DOWNS, CREATED};
 
 	String SQL_CREATE = "CREATE TABLE " + TABLE_NAME + " ( " + ID
-			+ " INTEGER PRIMARY KEY AUTOINCREMENT" + "," + AUTHOR + " TEXT"
-			+ "," + UPS + " INTEGER" + "," + DOWNS + " INTEGER" + "," + CREATED
-			+ " INTEGER" + "," + BODY_HTML + " TEXT" + "," + IDENTIFIER
-			+ " TEXT" + "," + POST_ID + " INTEGER" + " )";
+			+ " INTEGER PRIMARY KEY AUTOINCREMENT" + "," + POST_TITLE + " TEXT"
+			+ "," + POST_PERMALINK + " TEXT" + "," + COMMENT_ID + " TEXT" + ","
+			+ AUTHOR + " TEXT" + "," + BODY_HTML + " TEXT" + "," + NAME
+			+ " TEXT" + "," + LIKES + " INTEGER" + "," + UPS + " INTEGER" + ","
+			+ DOWNS + " INTEGER" + "," + CREATED + " INTEGER" + " )";
 
-	String SQL_INSERT = "INSERT INTO " + TABLE_NAME + " (" + AUTHOR + "," + UPS
-			+ "," + DOWNS + "," + CREATED + "," + BODY_HTML + "," + IDENTIFIER
-			+ POST_ID + ") VALUES ( ?, ?, ?, ?, ?, ?, ? )";
+	String SQL_INSERT = "INSERT INTO " + TABLE_NAME + " (" + POST_TITLE + ","
+			+ POST_PERMALINK + "," + COMMENT_ID + "," + AUTHOR + ","
+			+ BODY_HTML + "," + NAME + "," + LIKES + "," + UPS + "," + DOWNS
+			+ "," + CREATED + ") VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )";
 
 	String SQL_DROP = "DROP TABLE IF EXISTS " + TABLE_NAME;
 
diff --git a/src-gen/com/sobremesa/waywt/database/tables/ImageTable.java b/src-gen/com/sobremesa/waywt/database/tables/ImageTable.java
deleted file mode 100644
index 5bd7f5a..0000000
--- a/src-gen/com/sobremesa/waywt/database/tables/ImageTable.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.sobremesa.waywt.database.tables;
-
-/**
- * This interface represents the columns and SQLite statements for the ImageTable.
- * This table is represented in the sqlite database as Image column.
- * 				  
- * Generated Class. Do not modify!
- * 
- * @author MDSDACP Team - goetzfred@fh-bingen.de 
- * @date 2013.12.01
- */
-public interface ImageTable {
-	String TABLE_NAME = "image";
-
-	String ID = "_id";
-	String URL = "url";
-	String IDENTIFIER = "identifier";
-	String POST_ID = "postid";
-	String COMMENT_ID = "commentid";
-
-	String[] ALL_COLUMNS = new String[]{ID, URL, IDENTIFIER, POST_ID,
-			COMMENT_ID};
-
-	String SQL_CREATE = "CREATE TABLE " + TABLE_NAME + " ( " + ID
-			+ " INTEGER PRIMARY KEY AUTOINCREMENT" + "," + URL + " TEXT" + ","
-			+ IDENTIFIER + " TEXT" + "," + POST_ID + " INTEGER" + ","
-			+ COMMENT_ID + " INTEGER" + " )";
-
-	String SQL_INSERT = "INSERT INTO " + TABLE_NAME + " (" + URL + ","
-			+ IDENTIFIER + POST_ID + "," + COMMENT_ID
-			+ ") VALUES ( ?, ?, ?, ? )";
-
-	String SQL_DROP = "DROP TABLE IF EXISTS " + TABLE_NAME;
-
-	String WHERE_ID_EQUALS = ID + "=?";
-}
diff --git a/src-gen/com/sobremesa/waywt/database/tables/PostTable.java b/src-gen/com/sobremesa/waywt/database/tables/PostTable.java
index 4864f33..70f2fa9 100644
--- a/src-gen/com/sobremesa/waywt/database/tables/PostTable.java
+++ b/src-gen/com/sobremesa/waywt/database/tables/PostTable.java
@@ -7,7 +7,7 @@
  * Generated Class. Do not modify!
  * 
  * @author MDSDACP Team - goetzfred@fh-bingen.de 
- * @date 2013.12.01
+ * @date 2013.12.25
  */
 public interface PostTable {
 	String TABLE_NAME = "post";
diff --git a/src-gen/com/sobremesa/waywt/database/tables/ReplyTable.java b/src-gen/com/sobremesa/waywt/database/tables/ReplyTable.java
deleted file mode 100644
index e88f30c..0000000
--- a/src-gen/com/sobremesa/waywt/database/tables/ReplyTable.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.sobremesa.waywt.database.tables;
-
-/**
- * This interface represents the columns and SQLite statements for the ReplyTable.
- * This table is represented in the sqlite database as Reply column.
- * 				  
- * Generated Class. Do not modify!
- * 
- * @author MDSDACP Team - goetzfred@fh-bingen.de 
- * @date 2013.12.01
- */
-public interface ReplyTable {
-	String TABLE_NAME = "reply";
-
-	String ID = "_id";
-	String AUTHOR = "author";
-	String UPS = "ups";
-	String DOWNS = "downs";
-	String CREATED = "created";
-	String BODY_HTML = "body_html";
-	String IDENTIFIER = "identifier";
-	String PARENTIDENTIFIER = "parentidentifier";
-	String POST_ID = "postid";
-	String COMMENT_ID = "commentid";
-	String REPLY_ID = "replyid";
-
-	String[] ALL_COLUMNS = new String[]{ID, AUTHOR, UPS, DOWNS, CREATED,
-			BODY_HTML, IDENTIFIER, PARENTIDENTIFIER, POST_ID, COMMENT_ID,
-			REPLY_ID};
-
-	String SQL_CREATE = "CREATE TABLE " + TABLE_NAME + " ( " + ID
-			+ " INTEGER PRIMARY KEY AUTOINCREMENT" + "," + AUTHOR + " TEXT"
-			+ "," + UPS + " TEXT" + "," + DOWNS + " TEXT" + "," + CREATED
-			+ " TEXT" + "," + BODY_HTML + " TEXT" + "," + IDENTIFIER + " TEXT"
-			+ "," + PARENTIDENTIFIER + " TEXT" + "," + POST_ID + " INTEGER"
-			+ "," + COMMENT_ID + " INTEGER" + "," + REPLY_ID + " INTEGER"
-			+ " )";
-
-	String SQL_INSERT = "INSERT INTO " + TABLE_NAME + " (" + AUTHOR + "," + UPS
-			+ "," + DOWNS + "," + CREATED + "," + BODY_HTML + "," + IDENTIFIER
-			+ "," + PARENTIDENTIFIER + POST_ID + "," + COMMENT_ID + ","
-			+ REPLY_ID + ") VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )";
-
-	String SQL_DROP = "DROP TABLE IF EXISTS " + TABLE_NAME;
-
-	String WHERE_ID_EQUALS = ID + "=?";
-}
diff --git a/src-gen/com/sobremesa/waywt/model/Comment.java b/src-gen/com/sobremesa/waywt/model/Comment.java
index 1723702..4b1b230 100644
--- a/src-gen/com/sobremesa/waywt/model/Comment.java
+++ b/src-gen/com/sobremesa/waywt/model/Comment.java
@@ -10,17 +10,21 @@
  * Generated Class. Do not modify!
  * 
  * @author MDSDACP Team - goetzfred@fh-bingen.de 
- * @date 2013.12.01	 
+ * @date 2013.12.25	 
  */
 public class Comment {
 
 	private Long id;
+	private java.lang.String post_title;
+	private java.lang.String post_permalink;
+	private java.lang.String comment_id;
 	private java.lang.String author;
+	private java.lang.String body_html;
+	private java.lang.String name;
+	private int likes;
 	private int ups;
 	private int downs;
 	private long created;
-	private java.lang.String body_html;
-	private java.lang.String identifier;
 
 	private final ContentValues values = new ContentValues();
 
@@ -29,14 +33,20 @@ public Comment() {
 
 	public Comment(final Cursor cursor) {
 		setId(cursor.getLong(cursor.getColumnIndex(CommentTable.ID)));
+		setPost_title(cursor.getString(cursor
+				.getColumnIndex(CommentTable.POST_TITLE)));
+		setPost_permalink(cursor.getString(cursor
+				.getColumnIndex(CommentTable.POST_PERMALINK)));
+		setComment_id(cursor.getString(cursor
+				.getColumnIndex(CommentTable.COMMENT_ID)));
 		setAuthor(cursor.getString(cursor.getColumnIndex(CommentTable.AUTHOR)));
+		setBody_html(cursor.getString(cursor
+				.getColumnIndex(CommentTable.BODY_HTML)));
+		setName(cursor.getString(cursor.getColumnIndex(CommentTable.NAME)));
+		setLikes(cursor.getInt(cursor.getColumnIndex(CommentTable.LIKES)));
 		setUps(cursor.getInt(cursor.getColumnIndex(CommentTable.UPS)));
 		setDowns(cursor.getInt(cursor.getColumnIndex(CommentTable.DOWNS)));
 		setCreated(cursor.getLong(cursor.getColumnIndex(CommentTable.CREATED)));
-		setBody_html(cursor.getString(cursor
-				.getColumnIndex(CommentTable.BODY_HTML)));
-		setIdentifier(cursor.getString(cursor
-				.getColumnIndex(CommentTable.IDENTIFIER)));
 
 	}
 
@@ -59,6 +69,63 @@ public Long getId() {
 		return this.id;
 	}
 
+	/**
+	 * Set post_title and set content value
+	 *
+	 * @param post_title from type java.lang.String
+	 */
+	public void setPost_title(final java.lang.String post_title) {
+		this.post_title = post_title;
+		this.values.put(CommentTable.POST_TITLE, post_title);
+	}
+
+	/**
+	 * Get post_title
+	 *
+	 * @return post_title from type java.lang.String				
+	 */
+	public java.lang.String getPost_title() {
+		return this.post_title;
+	}
+
+	/**
+	 * Set post_permalink and set content value
+	 *
+	 * @param post_permalink from type java.lang.String
+	 */
+	public void setPost_permalink(final java.lang.String post_permalink) {
+		this.post_permalink = post_permalink;
+		this.values.put(CommentTable.POST_PERMALINK, post_permalink);
+	}
+
+	/**
+	 * Get post_permalink
+	 *
+	 * @return post_permalink from type java.lang.String				
+	 */
+	public java.lang.String getPost_permalink() {
+		return this.post_permalink;
+	}
+
+	/**
+	 * Set comment_id and set content value
+	 *
+	 * @param comment_id from type java.lang.String
+	 */
+	public void setComment_id(final java.lang.String comment_id) {
+		this.comment_id = comment_id;
+		this.values.put(CommentTable.COMMENT_ID, comment_id);
+	}
+
+	/**
+	 * Get comment_id
+	 *
+	 * @return comment_id from type java.lang.String				
+	 */
+	public java.lang.String getComment_id() {
+		return this.comment_id;
+	}
+
 	/**
 	 * Set author and set content value
 	 *
@@ -78,6 +145,63 @@ public java.lang.String getAuthor() {
 		return this.author;
 	}
 
+	/**
+	 * Set body_html and set content value
+	 *
+	 * @param body_html from type java.lang.String
+	 */
+	public void setBody_html(final java.lang.String body_html) {
+		this.body_html = body_html;
+		this.values.put(CommentTable.BODY_HTML, body_html);
+	}
+
+	/**
+	 * Get body_html
+	 *
+	 * @return body_html from type java.lang.String				
+	 */
+	public java.lang.String getBody_html() {
+		return this.body_html;
+	}
+
+	/**
+	 * Set name and set content value
+	 *
+	 * @param name from type java.lang.String
+	 */
+	public void setName(final java.lang.String name) {
+		this.name = name;
+		this.values.put(CommentTable.NAME, name);
+	}
+
+	/**
+	 * Get name
+	 *
+	 * @return name from type java.lang.String				
+	 */
+	public java.lang.String getName() {
+		return this.name;
+	}
+
+	/**
+	 * Set likes and set content value
+	 *
+	 * @param likes from type int
+	 */
+	public void setLikes(final int likes) {
+		this.likes = likes;
+		this.values.put(CommentTable.LIKES, likes);
+	}
+
+	/**
+	 * Get likes
+	 *
+	 * @return likes from type int				
+	 */
+	public int getLikes() {
+		return this.likes;
+	}
+
 	/**
 	 * Set ups and set content value
 	 *
@@ -135,44 +259,6 @@ public long getCreated() {
 		return this.created;
 	}
 
-	/**
-	 * Set body_html and set content value
-	 *
-	 * @param body_html from type java.lang.String
-	 */
-	public void setBody_html(final java.lang.String body_html) {
-		this.body_html = body_html;
-		this.values.put(CommentTable.BODY_HTML, body_html);
-	}
-
-	/**
-	 * Get body_html
-	 *
-	 * @return body_html from type java.lang.String				
-	 */
-	public java.lang.String getBody_html() {
-		return this.body_html;
-	}
-
-	/**
-	 * Set identifier and set content value
-	 *
-	 * @param identifier from type java.lang.String
-	 */
-	public void setIdentifier(final java.lang.String identifier) {
-		this.identifier = identifier;
-		this.values.put(CommentTable.IDENTIFIER, identifier);
-	}
-
-	/**
-	 * Get identifier
-	 *
-	 * @return identifier from type java.lang.String				
-	 */
-	public java.lang.String getIdentifier() {
-		return this.identifier;
-	}
-
 	/**
 	 * Get ContentValues
 	 *
diff --git a/src-gen/com/sobremesa/waywt/model/Image.java b/src-gen/com/sobremesa/waywt/model/Image.java
deleted file mode 100644
index 9a817bf..0000000
--- a/src-gen/com/sobremesa/waywt/model/Image.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.sobremesa.waywt.model;
-
-import android.content.ContentValues;
-import android.database.Cursor;
-import com.sobremesa.waywt.database.tables.ImageTable;
-
-/**
- * Generated model class for usage in your application, defined by classifiers in ecore diagram
- * 		
- * Generated Class. Do not modify!
- * 
- * @author MDSDACP Team - goetzfred@fh-bingen.de 
- * @date 2013.12.01	 
- */
-public class Image {
-
-	private Long id;
-	private java.lang.String url;
-	private java.lang.String identifier;
-
-	private final ContentValues values = new ContentValues();
-
-	public Image() {
-	}
-
-	public Image(final Cursor cursor) {
-		setId(cursor.getLong(cursor.getColumnIndex(ImageTable.ID)));
-		setUrl(cursor.getString(cursor.getColumnIndex(ImageTable.URL)));
-		setIdentifier(cursor.getString(cursor
-				.getColumnIndex(ImageTable.IDENTIFIER)));
-
-	}
-
-	/**
-	 * Set id
-	 *
-	 * @param id from type java.lang.Long
-	 */
-	public void setId(final Long id) {
-		this.id = id;
-		this.values.put(ImageTable.ID, id);
-	}
-
-	/**
-	 * Get id
-	 *
-	 * @return id from type java.lang.Long				
-	 */
-	public Long getId() {
-		return this.id;
-	}
-
-	/**
-	 * Set url and set content value
-	 *
-	 * @param url from type java.lang.String
-	 */
-	public void setUrl(final java.lang.String url) {
-		this.url = url;
-		this.values.put(ImageTable.URL, url);
-	}
-
-	/**
-	 * Get url
-	 *
-	 * @return url from type java.lang.String				
-	 */
-	public java.lang.String getUrl() {
-		return this.url;
-	}
-
-	/**
-	 * Set identifier and set content value
-	 *
-	 * @param identifier from type java.lang.String
-	 */
-	public void setIdentifier(final java.lang.String identifier) {
-		this.identifier = identifier;
-		this.values.put(ImageTable.IDENTIFIER, identifier);
-	}
-
-	/**
-	 * Get identifier
-	 *
-	 * @return identifier from type java.lang.String				
-	 */
-	public java.lang.String getIdentifier() {
-		return this.identifier;
-	}
-
-	/**
-	 * Get ContentValues
-	 *
-	 * @return id from type android.content.ContentValues with the values of this object				
-	 */
-	public ContentValues getContentValues() {
-		return this.values;
-	}
-}
diff --git a/src-gen/com/sobremesa/waywt/model/Post.java b/src-gen/com/sobremesa/waywt/model/Post.java
index 8af31e1..91cdd48 100644
--- a/src-gen/com/sobremesa/waywt/model/Post.java
+++ b/src-gen/com/sobremesa/waywt/model/Post.java
@@ -10,7 +10,7 @@
  * Generated Class. Do not modify!
  * 
  * @author MDSDACP Team - goetzfred@fh-bingen.de 
- * @date 2013.12.01	 
+ * @date 2013.12.25	 
  */
 public class Post {
 
diff --git a/src-gen/gen.properties b/src-gen/gen.properties
index e125a74..88dea1d 100644
--- a/src-gen/gen.properties
+++ b/src-gen/gen.properties
@@ -1 +1 @@
-gen-count=18
\ No newline at end of file
+gen-count=7
\ No newline at end of file
diff --git a/src/com/sobremesa/waywt/activities/ImageActivity.java b/src/com/sobremesa/waywt/activities/ImageActivity.java
index 2b07834..148e451 100644
--- a/src/com/sobremesa/waywt/activities/ImageActivity.java
+++ b/src/com/sobremesa/waywt/activities/ImageActivity.java
@@ -8,7 +8,6 @@
 import com.sobremesa.waywt.application.WaywtApplication;
 import com.sobremesa.waywt.contentprovider.Provider;
 import com.sobremesa.waywt.database.tables.CommentTable;
-import com.sobremesa.waywt.database.tables.ImageTable;
 import com.sobremesa.waywt.fragments.WaywtFragment.Extras;
 import com.sobremesa.waywt.managers.FontManager;
 import com.sobremesa.waywt.managers.TypefaceSpan;
diff --git a/src/com/sobremesa/waywt/activities/MainActivity.java b/src/com/sobremesa/waywt/activities/MainActivity.java
index 05c5e01..dec3ba8 100644
--- a/src/com/sobremesa/waywt/activities/MainActivity.java
+++ b/src/com/sobremesa/waywt/activities/MainActivity.java
@@ -77,6 +77,7 @@ public class MainActivity extends BaseFragmentActivity implements ActionBar.OnNa
 	public static class NavItem {
 		public String mTitle;
 		public String mDescription;
+		public String mPermalink;
 	}
 
 	public static class DrawerTabIndex {
@@ -105,7 +106,7 @@ public static class DrawerTabIndex {
 	private int mCurrentWaywtIndex = 0;
 	
 
-	private ArrayList<String> mPermalinks;
+	private ArrayList<NavItem> mNavItems;
 
 	private static final HttpClient mRedditClient = WaywtApplication.getRedditClient();
 	private static final RedditSettings mRedditSettings = WaywtApplication.getRedditSettings();
@@ -118,7 +119,7 @@ protected void onCreate(Bundle savedInstanceState) {
 		setContentView(R.layout.activity_main);
 		getOverflowMenu();
 		
-		mPermalinks = new ArrayList<String>();
+		mNavItems = new ArrayList<NavItem>();
 
 		// ACTION BAR
 		final ActionBar actionBar = getActionBar();
@@ -201,7 +202,7 @@ public void onDrawerOpened(View drawerView) {
 			showSubredditDialog();
 		
 		CookieSyncManager.createInstance(getApplicationContext());
-		
+		mRedditSettings.loadRedditPreferences(this, mRedditClient);
 		
 		showWaywt();
 	}
@@ -273,7 +274,6 @@ public void showMyPosts() {
 			
 			Fragment fragment = Fragment.instantiate(this, MyPostsFragment.class.getName());
 			Bundle args = new Bundle();
-			args.putStringArrayList(MyPostsFragment.Extras.PERMALINKS, mPermalinks);
 			args.putString(MyPostsFragment.Extras.SUBREDDIT, UserUtil.getSubreddit());
 			fragment.setArguments(args);
 			
@@ -364,13 +364,14 @@ public boolean onNavigationItemSelected(int position, long id) {
 
 	private void refreshNavigationBar(int position) {
 		
-		if(mPermalinks != null && position < mPermalinks.size()-1)
+		if(mNavItems != null && position < mNavItems.size()-1)
 		{
 			Fragment fragment = new WaywtFragment();
 			Bundle args = new Bundle();
-			String p = mPermalinks.get(position);
+			String p = mNavItems.get(position).mPermalink;
 			args.putString(WaywtFragment.Extras.SUBREDDIT, UserUtil.getSubreddit());
 			args.putString(WaywtFragment.Extras.PERMALINK, p);
+			args.putString(WaywtFragment.Extras.SUBREDDIT, UserUtil.getSubreddit());
 			fragment.setArguments(args);
 			getSupportFragmentManager().beginTransaction().replace(R.id.content_frame, fragment).commitAllowingStateLoss();			
 		}
@@ -399,13 +400,21 @@ public void onConfigurationChanged(Configuration newConfig) {
 		mDrawerToggle.onConfigurationChanged(newConfig);
 	}
 	
+	@Override
+	public boolean onPrepareOptionsMenu(Menu menu) {
+		boolean drawerOpen = mDrawerLayout.isDrawerOpen(mDrawerList);
+		if (drawerOpen)
+			menu.clear();
+		return super.onPrepareOptionsMenu(menu);
+	}
+
+	
 	private void fetchPostData() {
 
 		Intent i = new Intent(this, PostService.class);
 		i.setAction(Intent.ACTION_SYNC);
 		i.putExtra(PostService.Extras.IS_MALE, UserUtil.getIsMale());
 		startService(i);  
-		
 	}
 
 	@Override
@@ -418,17 +427,16 @@ public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
 	@Override
 	public void onLoadFinished(Loader<Cursor> arg0, Cursor cursor) {
 		mNavAdapter.clear();
-		mPermalinks.clear();
-
+		mNavItems.clear();
+		
 		for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
 
 			NavItem navItem = new NavItem();
 			navItem.mTitle = cursor.getString(cursor.getColumnIndex(PostTable.TITLE));
+			navItem.mPermalink = cursor.getString(cursor.getColumnIndex(PostTable.PERMALINK));
 			
 			mNavAdapter.add(navItem);
-
-			String p = cursor.getString(cursor.getColumnIndex(PostTable.PERMALINK));
-			mPermalinks.add(p);
+			mNavItems.add(navItem);
 		}
 
 		mNavAdapter.notifyDataSetChanged();
@@ -437,7 +445,6 @@ public void onLoadFinished(Loader<Cursor> arg0, Cursor cursor) {
 
 			refreshNavigationBar(0);
 		}
-
 	}
 
 	@Override
@@ -550,7 +557,7 @@ public void onClick(DialogInterface dialog, int which) {
 //					break;
 				}
 				
-				if( mPermalinks.size() > 0)
+				if( mNavItems.size() > 0)
 					refreshNavigationBar(mCurrentWaywtIndex);
 				
 				dialog.dismiss();
diff --git a/src/com/sobremesa/waywt/activities/PhotoActivity.java b/src/com/sobremesa/waywt/activities/PhotoActivity.java
index 7416873..8e6b89f 100755
--- a/src/com/sobremesa/waywt/activities/PhotoActivity.java
+++ b/src/com/sobremesa/waywt/activities/PhotoActivity.java
@@ -31,9 +31,11 @@
 import com.sobremesa.waywt.common.CacheInfo;
 import com.sobremesa.waywt.common.Common;
 import com.sobremesa.waywt.common.Constants;
+import com.sobremesa.waywt.listeners.MyPostsListener;
 import com.sobremesa.waywt.managers.FontManager;
 import com.sobremesa.waywt.model.ThingInfo;
 import com.sobremesa.waywt.settings.RedditSettings;
+import com.sobremesa.waywt.tasks.DownloadMyPostsTask;
 import com.sobremesa.waywt.tasks.ImgurUploadTask;
 import com.sobremesa.waywt.util.UserUtil;
 
@@ -45,6 +47,7 @@
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.provider.MediaStore;
 import android.util.Base64;
@@ -69,7 +72,7 @@
  *
  * @author Sebastian Kaspari <sebastian@androidzeitgeist.com>
  */
-public class PhotoActivity extends BaseFragmentActivity {
+public class PhotoActivity extends BaseFragmentActivity implements MyPostsListener {
 	private static final String TAG = PhotoActivity.class.getSimpleName();
 	
     private static final String MIME_TYPE = "image/jpeg";
@@ -95,6 +98,8 @@ public static class Extras
 	private EditText mDescriptionEt;
 	
 
+	
+	
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -137,7 +142,6 @@ private void postPhoto()
     {
 		if( !mTitleEt.getText().toString().isEmpty() && !mDescriptionEt.getText().toString().isEmpty() )
 		{
-			showProgressDialog("UPLOADING PHOTO TO IMGUR");
 			new MyImgurUploadTask(mImageUri).execute();
 		}
 		else
@@ -153,6 +157,9 @@ public MyImgurUploadTask(Uri imageUri) {
 		@Override
 		protected void onPreExecute() {
 			super.onPreExecute();
+			
+			showProgressDialog("UPLOADING PHOTO TO IMGUR");
+			
 			if (mImgurUploadTask != null) {
 				boolean cancelled = mImgurUploadTask.cancel(false);
 				if (!cancelled)
@@ -175,7 +182,6 @@ protected void onPostExecute(String imageId) {
 				text += System.getProperty ("line.separator") + System.getProperty ("line.separator");
 				text += mDescriptionEt.getText().toString();
 				
-				showProgressDialog("POSTING TO REDDIT");
 				new CommentReplyTask(mComment.getName()).execute(text);
 				
 			} else {
@@ -193,6 +199,8 @@ private class CommentReplyTask extends AsyncTask<String, Void, String> {
     		_mParentThingId = parentThingId;
     	}
     	
+    	
+    	
     	@Override
         public String doInBackground(String... text) {
         	HttpEntity entity = null;
@@ -258,6 +266,7 @@ public String doInBackground(String... text) {
     	
     	@Override
     	public void onPreExecute() {
+			showProgressDialog("POSTING TO REDDIT");
     	}
     	
     	@Override
@@ -272,9 +281,23 @@ public void onPostExecute(String newId) {
     			// Refresh
     			CacheInfo.invalidateCachedThread(WaywtApplication.getContext());
     			
-				Intent intent = new Intent(getApplicationContext(), MainActivity.class);
-				intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-				startActivity(intent);
+    			List<String> threadIds = new ArrayList<String>();
+    			List<String> permalinks = new ArrayList<String>();
+    			List<String> titles = new ArrayList<String>();
+    			threadIds.add(mComment.getThreadId());
+    			permalinks.add(mComment.getPostPermalink());
+    			titles.add(mComment.getPostTitle());
+    			
+    			Log.d("threadId", mComment.getThreadId());
+    			Log.d("permalink", mComment.getPostPermalink());
+    			
+				showProgressDialog("FINALIZING...");
+				
+    			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
+    				new DownloadMyPostsTask(PhotoActivity.this, UserUtil.getSubreddit(), threadIds, permalinks, titles, mRedditSettings, mRedditClient).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, Constants.DEFAULT_COMMENT_DOWNLOAD_LIMIT);
+    			else
+    				new DownloadMyPostsTask(PhotoActivity.this, UserUtil.getSubreddit(), threadIds, permalinks, titles, mRedditSettings, mRedditClient).execute(Constants.DEFAULT_COMMENT_DOWNLOAD_LIMIT);
+
     		}
     	}
     }
@@ -304,17 +327,16 @@ public boolean onOptionsItemSelected(MenuItem item) {
 		}
 		return super.onOptionsItemSelected(item);
 	}
-	
-
-	
 
-    private void initializeShareAction(MenuItem shareItem) {
-        ShareActionProvider shareProvider = (ShareActionProvider) shareItem.getActionProvider();
 
-        Intent shareIntent = new Intent(Intent.ACTION_SEND);
-        shareIntent.putExtra(Intent.EXTRA_STREAM, mImageUri);
-        shareIntent.setType(MIME_TYPE);
+	@Override
+	public void onSuccess() {
+		hideProgressDialog();
+		
+		Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+		intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+		startActivity(intent);
+	}
+	
 
-        shareProvider.setShareIntent(shareIntent);
-    }
 }
diff --git a/src/com/sobremesa/waywt/application/WaywtApplication.java b/src/com/sobremesa/waywt/application/WaywtApplication.java
index 3938394..3a73eb0 100644
--- a/src/com/sobremesa/waywt/application/WaywtApplication.java
+++ b/src/com/sobremesa/waywt/application/WaywtApplication.java
@@ -39,8 +39,6 @@ public void onCreate() {
 		ImageLoader.setMaximumMemCacheSize(this, MAX_IMAGES_MEM_CACHE_SIZE);
 
 		sContext = getApplicationContext();
-		
-		mRedditSettings.loadRedditPreferences(sContext, mRedditClient);
 	}
 	
 	
diff --git a/src/com/sobremesa/waywt/fragments/CommentFragment.java b/src/com/sobremesa/waywt/fragments/CommentFragment.java
index f1ab44a..a51cfc1 100644
--- a/src/com/sobremesa/waywt/fragments/CommentFragment.java
+++ b/src/com/sobremesa/waywt/fragments/CommentFragment.java
@@ -32,7 +32,6 @@
 import com.sobremesa.waywt.common.Constants;
 import com.sobremesa.waywt.common.RedditIsFunHttpClientFactory;
 import com.sobremesa.waywt.contentprovider.Provider;
-import com.sobremesa.waywt.database.tables.ImageTable;
 import com.sobremesa.waywt.database.tables.CommentTable;
 import com.sobremesa.waywt.listeners.CommentsListener;
 import com.sobremesa.waywt.listeners.RepliesListener;
@@ -105,7 +104,6 @@
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.Toast;
-import android.widget.ViewFlipper;
 import android.widget.ImageView.ScaleType;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
@@ -313,7 +311,7 @@ public void onDestroyView() {
     	// TODO Auto-generated method stub
     	super.onDestroyView();
     	
-    	unbindDrawables(getView().findViewById(R.id.vf));
+    	unbindDrawables(getView().findViewById(R.id.root_layout));
     }
 	
 	private void unbindDrawables(View view)
@@ -510,8 +508,6 @@ public void onImageLoadError(String arg0) {
 					
 					if( parentView != null )
 					{
-						ViewFlipper vf = (ViewFlipper)parentView.findViewById(R.id.vf);
-						vf.setDisplayedChild(1);
 						
 						ListView lv = (ListView)parentView.findViewById(R.id.replies_lv);
 						lv.setVisibility(View.VISIBLE);
@@ -531,8 +527,6 @@ public void onImageAvailable(ImageView imageView, Bitmap bitmap, ImageReturnedFr
 					{
 						imageView.setImageBitmap(bitmap);
 					
-						ViewFlipper vf = (ViewFlipper)parentView.findViewById(R.id.vf);
-						vf.setDisplayedChild(1);
 						
 						ListView lv = (ListView)parentView.findViewById(R.id.replies_lv);
 						lv.setVisibility(View.VISIBLE);
@@ -628,8 +622,6 @@ public void onClick(View v) {
 			
 			if( parentView != null )
 			{
-				ViewFlipper vf = (ViewFlipper)parentView.findViewById(R.id.vf);
-				vf.setDisplayedChild(1);
 				
 				ListView lv = (ListView)parentView.findViewById(R.id.replies_lv);
 				lv.setVisibility(View.VISIBLE);
@@ -1252,8 +1244,6 @@ public void updateComments(List<ThingInfo> comments) {
 				}
 			}
 			
-//			ViewFlipper vf = (ViewFlipper)getView().findViewById(R.id.vf);
-//			vf.setDisplayedChild(1);
 		}
 	}
 	
diff --git a/src/com/sobremesa/waywt/fragments/ImageFragment.java b/src/com/sobremesa/waywt/fragments/ImageFragment.java
index 5e8cacb..1f63161 100644
--- a/src/com/sobremesa/waywt/fragments/ImageFragment.java
+++ b/src/com/sobremesa/waywt/fragments/ImageFragment.java
@@ -1,7 +1,6 @@
 package com.sobremesa.waywt.fragments;
 
 import com.sobremesa.waywt.R;
-import com.sobremesa.waywt.database.tables.ImageTable;
 import com.sobremesa.waywt.model.ThingInfo;
 import com.xtremelabs.imageutils.ImageLoader;
 import com.xtremelabs.imageutils.ImageLoaderListener;
diff --git a/src/com/sobremesa/waywt/fragments/MyPostsFragment.java b/src/com/sobremesa/waywt/fragments/MyPostsFragment.java
index 178aad3..6f70335 100644
--- a/src/com/sobremesa/waywt/fragments/MyPostsFragment.java
+++ b/src/com/sobremesa/waywt/fragments/MyPostsFragment.java
@@ -1,11 +1,14 @@
 package com.sobremesa.waywt.fragments;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 import java.util.Random;
+import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -17,16 +20,19 @@
 import com.sobremesa.waywt.R;
 import com.sobremesa.waywt.activities.CameraActivity;
 import com.sobremesa.waywt.activities.MainActivity;
+import com.sobremesa.waywt.activities.MainActivity.DrawerTabIndex;
+import com.sobremesa.waywt.activities.MainActivity.NavItem;
 import com.sobremesa.waywt.application.WaywtApplication;
 import com.sobremesa.waywt.common.Constants;  
 import com.sobremesa.waywt.common.RedditIsFunHttpClientFactory;
 import com.sobremesa.waywt.contentprovider.Provider;
 import com.sobremesa.waywt.database.tables.CommentTable;
+import com.sobremesa.waywt.database.tables.PostTable;
 import com.sobremesa.waywt.enums.SortByType;
 import com.sobremesa.waywt.listeners.CommentsListener;
 import com.sobremesa.waywt.listeners.MyPostsListener;
 import com.sobremesa.waywt.managers.FontManager;
-import com.sobremesa.waywt.model.MyPost;
+import com.sobremesa.waywt.model.Post;
 import com.sobremesa.waywt.model.ThingInfo;
 import com.sobremesa.waywt.service.PostService;
 import com.sobremesa.waywt.settings.RedditSettings;
@@ -36,6 +42,8 @@
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.support.v4.app.Fragment;
@@ -46,6 +54,7 @@
 import android.support.v4.content.Loader;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
+import android.text.format.DateFormat;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -56,15 +65,17 @@
 import android.view.Window;
 import android.webkit.CookieSyncManager;
 import android.widget.Toast;
-import android.widget.ViewFlipper;
 
-public class MyPostsFragment extends Fragment implements MyPostsListener {
+public class MyPostsFragment extends Fragment implements MyPostsListener, LoaderCallbacks<Cursor> {
 
 	public static final String TAG = WaywtFragment.class.getCanonicalName();
 
+	public static final int POST_LOADER_ID = 0;
+	public static final int COMMENT_LOADER_ID = 1;
+	
+	
 	public static class Extras {
 		public static String SUBREDDIT = "subreddit";
-		public static String PERMALINKS = "permalinks";
 	}
 	
 	
@@ -74,10 +85,12 @@ public static class Extras {
 
 	private ViewPager mPager;
 	public MyPostPagerAdapter mPagerAdapter;
-	private TitlePageIndicator mindicator;
+	private TitlePageIndicator mIndicator;
 
 	private String mSubreddit = UserUtil.getSubreddit();
 	private List<String> mThreadIds;
+	private List<String> mPermalinks;
+	private List<String> mTitles;
 	private ThingInfo mOPComment = null;
 	
 	private final HttpClient mRedditClient = WaywtApplication.getRedditClient();
@@ -88,7 +101,7 @@ public static class Extras {
 	
 	
 	private DownloadMyPostsTask getNewDownloadMyPostsTask() {
-		return new DownloadMyPostsTask(this, mSubreddit, mThreadIds, mRedditSettings, mRedditClient);
+		return new DownloadMyPostsTask(this, mSubreddit, mThreadIds,mPermalinks, mTitles, mRedditSettings, mRedditClient);
 	}
 
 	@Override
@@ -96,64 +109,26 @@ public void onCreate(Bundle savedInstanceState) {
 		// TODO Auto-generated method stub
 		super.onCreate(savedInstanceState);
 
-		ArrayList<String> permalinks = getArguments().getStringArrayList(Extras.PERMALINKS);
 		mThreadIds = new ArrayList<String>();
+		mPermalinks = new ArrayList<String>();
+		mTitles = new ArrayList<String>();
+		
 		mSubreddit = getArguments().getString(Extras.SUBREDDIT);
 
-		for( String s : permalinks )
-		{
-			String commentPath = null;
-			String commentQuery;
-			String jumpToCommentId = null;
-			Uri data = Uri.parse(s);
-			if (data != null) {
-				// Comment path: a URL pointing to a thread or a comment in a
-				// thread.
-				commentPath = data.getPath();
-				commentQuery = data.getQuery();
-			} else {
-				if (Constants.LOGGING)
-					Log.e(TAG, "Quitting because no subreddit and thread id data was passed into the Intent.");
-				getActivity().finish();
-			}
-			
-			if (commentPath != null) {
-				if (Constants.LOGGING)
-					Log.d(TAG, "comment path: " + commentPath);
-				
-				if (Util.isRedditShortenedUri(data)) {
-					// http://redd.it/abc12
-					mThreadIds.add(commentPath.substring(1));
-				} else {
-					// http://www.reddit.com/...
-					Matcher m = COMMENT_PATH_PATTERN.matcher(commentPath);
-					if (m.matches()) {
-						mSubreddit = m.group(1);
-						mThreadIds.add(m.group(2));
-						jumpToCommentId = m.group(3);
-					}
-				}
-			} else {
-				if (Constants.LOGGING)
-					Log.e(TAG, "Quitting because of bad comment path.");
-				getActivity().finish();
-			}
-			
-		}
 	}
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		// TODO Auto-generated method stub
-		View view = inflater.inflate(R.layout.fragment_waywt, null, false);
+		View view = inflater.inflate(R.layout.fragment_my_posts, null, false);
 
 		mPager = (ViewPager) view.findViewById(R.id.pager);
 		mPagerAdapter = new MyPostPagerAdapter(getChildFragmentManager(), mSubreddit);
 		mPager.setAdapter(mPagerAdapter);
 
-		mindicator = (TitlePageIndicator) view.findViewById(R.id.page_indicator);
-		mindicator.setViewPager(mPager);
-		mindicator.setTypeface(FontManager.INSTANCE.getAppFont());
+		mIndicator = (TitlePageIndicator) view.findViewById(R.id.page_indicator);
+		mIndicator.setViewPager(mPager);
+		mIndicator.setTypeface(FontManager.INSTANCE.getAppFont());
 
 		
 		return view;
@@ -164,7 +139,12 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
 		// TODO Auto-generated method stub
 		super.onViewCreated(view, savedInstanceState);
 
-		fetchComments();
+		if( mRedditSettings.isLoggedIn() )
+		{
+			getLoaderManager().initLoader(POST_LOADER_ID, null, this);
+			getLoaderManager().initLoader(COMMENT_LOADER_ID, null, this);			
+		}
+
 	}
 	
 
@@ -191,26 +171,6 @@ public void onDestroy() {
 		super.onDestroy();
 	}
 
-	@Override
-	public void resetUI() {
-		// findViewById(R.id.loading_light).setVisibility(View.GONE);
-		// findViewById(R.id.loading_dark).setVisibility(View.GONE);
-
-		if( mPagerAdapter != null )
-			mPagerAdapter.mIsLoading = false;
-	}
-
-	@Override
-	public void enableLoadingScreen() {
-		// findViewById(R.id.loading_light).setVisibility(View.VISIBLE);
-		// findViewById(R.id.loading_dark).setVisibility(View.GONE);
-
-		if (mPagerAdapter != null)
-			mPagerAdapter.mIsLoading = true;
-		getActivity().getWindow().setFeatureInt(Window.FEATURE_PROGRESS, Window.PROGRESS_START);
-	}
-
-
 	
 	
 	private void fetchComments()
@@ -220,7 +180,10 @@ private void fetchComments()
 			mRefreshMenuItem.setVisible(false);
 		}
 		
-		getNewDownloadMyPostsTask().execute(Constants.DEFAULT_COMMENT_DOWNLOAD_LIMIT);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
+			getNewDownloadMyPostsTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, Constants.DEFAULT_COMMENT_DOWNLOAD_LIMIT);
+		else
+			getNewDownloadMyPostsTask().execute(Constants.DEFAULT_COMMENT_DOWNLOAD_LIMIT);
 	}
 	
 	
@@ -244,7 +207,7 @@ private int getReplyCount( ThingInfo ci )
 	public static class MyPostPagerAdapter extends FragmentStatePagerAdapter {
 		public boolean mIsLoading = false;
 
-		private ArrayList<MyPost> mMyPosts = new ArrayList<MyPost>();
+		private ArrayList<ThingInfo> mMyPosts = new ArrayList<ThingInfo>();
 
 		private String mSubreddit = "";
 
@@ -254,10 +217,9 @@ public MyPostPagerAdapter(FragmentManager fragmentManager, String subreddit) {
 			mSubreddit = subreddit;
 		}
 
-		public void addMyPosts(List<MyPost> myPosts) {
-			
+		public void addMyPosts(List<ThingInfo> comments) {
 			mMyPosts.clear();
-			mMyPosts.addAll(myPosts);
+			mMyPosts.addAll(comments);
 
 			this.notifyDataSetChanged();
 		}
@@ -268,8 +230,8 @@ public Fragment getItem(int position) {
 			CommentFragment fragment = new CommentFragment();
 			Bundle args = new Bundle();
 			args.putString(CommentFragment.Extras.SUBREDDIT, mSubreddit);
-			args.putString(CommentFragment.Extras.THREAD_ID, mMyPosts.get(position).getThreadId());
-			args.putParcelable(CommentFragment.Extras.COMMENT, mMyPosts.get(position).getComment());
+			args.putString(CommentFragment.Extras.THREAD_ID,  mMyPosts.get(position).getThreadId());
+			args.putParcelable(CommentFragment.Extras.COMMENT, mMyPosts.get(position));  
 			fragment.setArguments(args);
 
 			return fragment;
@@ -283,10 +245,7 @@ public int getCount() {
 
 		@Override
 		public CharSequence getPageTitle(int position) {
-			if (mMyPosts.get(position).getComment().getAuthor() != null)
-				return mMyPosts.get(position).getComment().getAuthor().toUpperCase();
-
-			return null;
+			return mMyPosts.get(position).getPostTitle().toUpperCase();
 		}
 
 	}
@@ -429,33 +388,142 @@ public boolean onOptionsItemSelected(MenuItem item) {
 		return super.onOptionsItemSelected(item);
 	}
 
-	@Override
-	public void updateMyPosts(List<MyPost> myPosts) {
-		if (getView() != null) {
 
+	@Override
+	public Loader<Cursor> onCreateLoader(int loaderId, Bundle arg1) {
+		switch(loaderId)
+		{
+		case POST_LOADER_ID:
+			return new CursorLoader(getActivity(), Provider.POST_CONTENT_URI, PostTable.ALL_COLUMNS, PostTable.IS_MALE + "=?", new String[] { UserUtil.getIsMale() ? "1" : "0" }, PostTable.CREATED + " DESC");
+		case COMMENT_LOADER_ID:
+			return new CursorLoader(getActivity(), Provider.COMMENT_CONTENT_URI, CommentTable.ALL_COLUMNS, CommentTable.AUTHOR + "=?", new String[] { mRedditSettings.getUsername() }, CommentTable.CREATED + " DESC");
+		}
+		
+		return null;
+		
+	}
 
-			mPagerAdapter.addMyPosts(myPosts);
+	@Override
+	public void onLoadFinished(Loader<Cursor> loader, Cursor cursor) {
 
-			ViewFlipper vf = (ViewFlipper) getView().findViewById(R.id.vf);
-			vf.setDisplayedChild(1);
+		switch( loader.getId() )
+		{
+		case POST_LOADER_ID:
 			
-			// UPDATE NAV BAR
-//			MainActivity act = (MainActivity)getActivity();
-//			
-//			if( act != null )
-//				act.updateCurrentNavItemDescription(comments.size()+" POSTS");
+			mThreadIds.clear();
+			mPermalinks.clear();
+			mTitles.clear();
 			
+			for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+				
+				mTitles.add(cursor.getString(cursor.getColumnIndex(PostTable.TITLE)));
+				mPermalinks.add(cursor.getString(cursor.getColumnIndex(PostTable.PERMALINK)));
+				
+				String commentPath = null;
+				String commentQuery;
+				String jumpToCommentId = null;
+				Uri data = Uri.parse(cursor.getString(cursor.getColumnIndex(PostTable.PERMALINK)));
+				if (data != null) {
+					// Comment path: a URL pointing to a thread or a comment in a
+					// thread.
+					commentPath = data.getPath();
+					commentQuery = data.getQuery();
+				} else {
+					if (Constants.LOGGING)
+						Log.e(TAG, "Quitting because no subreddit and thread id data was passed into the Intent.");
+					getActivity().finish();
+				}
+				
+				Post post;
+				
+				if (commentPath != null) {
+					if (Constants.LOGGING)
+						Log.d(TAG, "comment path: " + commentPath);
+					
+					post = new Post();
+					
+					if (Util.isRedditShortenedUri(data)) {
+						// http://redd.it/abc12
+						post.setPermalink(commentPath.substring(1));
+						post.setTitle(cursor.getString(cursor.getColumnIndex(PostTable.TITLE)));
+						mThreadIds.add(commentPath.substring(1));
+					} else {
+						// http://www.reddit.com/...
+						Matcher m = COMMENT_PATH_PATTERN.matcher(commentPath);
+						if (m.matches()) {
+							mSubreddit = m.group(1);
+							mThreadIds.add(m.group(2));
+							jumpToCommentId = m.group(3);
+						}
+					}
+				} else {
+					if (Constants.LOGGING)
+						Log.e(TAG, "Quitting because of bad comment path.");
+					getActivity().finish();
+				}
+			}
 			
-			Log.d("yoo", "yooo");
+			fetchComments();
 			
-			// UPDATE MENU ITEMS
-			if (mRefreshMenuItem != null && mLoadingMenuItem != null) {
-				mRefreshMenuItem.setVisible(true);
-				mLoadingMenuItem.setVisible(false);
+			
+			break;
+			
+		case COMMENT_LOADER_ID: 
+			
+			List<ThingInfo> myPosts = new ArrayList<ThingInfo>();
+			
+			for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+				
+				ThingInfo comment = new ThingInfo();
+				comment.setPostTitle(cursor.getString(cursor.getColumnIndex(CommentTable.POST_TITLE)));
+				comment.setPostPermalink(cursor.getString(cursor.getColumnIndex(CommentTable.POST_PERMALINK)));
+				
+				comment.setAuthor(cursor.getString(cursor.getColumnIndex(CommentTable.AUTHOR)));
+				comment.setBody_html(cursor.getString(cursor.getColumnIndex(CommentTable.BODY_HTML)));
+				comment.setId(cursor.getString(cursor.getColumnIndex(CommentTable.COMMENT_ID)));
+				comment.setDowns(cursor.getInt(cursor.getColumnIndex(CommentTable.DOWNS)));
+				comment.setUps(cursor.getInt(cursor.getColumnIndex(CommentTable.UPS)));
+				comment.setLikes(cursor.getInt(cursor.getColumnIndex(CommentTable.LIKES)) == 1);
+				comment.setName(cursor.getString(cursor.getColumnIndex(CommentTable.NAME)));
+				comment.setCreated_utc(cursor.getLong(cursor.getColumnIndex(CommentTable.CREATED)));
+				
+				myPosts.add(comment);
 			}
+			
+			if (getView() != null) {
+
+
+				mPagerAdapter.addMyPosts(myPosts);
+				mPager.setAdapter(mPagerAdapter);
+				
+//				ViewFlipper vf = (ViewFlipper) getView().findViewById(R.id.vf);
+//				vf.setDisplayedChild(1);
+				
+				// UPDATE MENU ITEMS
+				if (mRefreshMenuItem != null && mLoadingMenuItem != null) {
+					mRefreshMenuItem.setVisible(true);
+					mLoadingMenuItem.setVisible(false);
+				}
+			}
+			break;
 		}
+		
+
 	}
 	
+	
+
+	@Override
+	public void onLoaderReset(Loader<Cursor> arg0) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void onSuccess() {
+		// TODO Auto-generated method stub
+		
+	}
 
 
 }
diff --git a/src/com/sobremesa/waywt/fragments/WaywtFragment.java b/src/com/sobremesa/waywt/fragments/WaywtFragment.java
index 664050b..cb5c7a2 100644
--- a/src/com/sobremesa/waywt/fragments/WaywtFragment.java
+++ b/src/com/sobremesa/waywt/fragments/WaywtFragment.java
@@ -29,6 +29,7 @@
 import com.sobremesa.waywt.service.PostService;
 import com.sobremesa.waywt.settings.RedditSettings;
 import com.sobremesa.waywt.tasks.DownloadCommentsTask;
+import com.sobremesa.waywt.tasks.DownloadRepliesTask;
 import com.viewpagerindicator.TitlePageIndicator;
 
 import android.content.Intent;
@@ -54,7 +55,6 @@
 import android.view.Window;
 import android.webkit.CookieSyncManager;
 import android.widget.Toast;
-import android.widget.ViewFlipper;
 
 public class WaywtFragment extends Fragment implements CommentsListener {
 
@@ -63,6 +63,7 @@ public class WaywtFragment extends Fragment implements CommentsListener {
 	public static class Extras {
 		public static String SUBREDDIT = "subreddit";
 		public static String PERMALINK = "permalink";
+		public static String POST_TITLE = "title";
 	}
 
 	private final Pattern COMMENT_PATH_PATTERN = Pattern.compile(Constants.COMMENT_PATH_PATTERN_STRING);
@@ -93,7 +94,8 @@ public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
 		mSubreddit = getArguments().getString(Extras.SUBREDDIT);
-
+		mThreadId = getArguments().getString(Extras.POST_TITLE);
+		
 		String commentPath = null;
 		String commentQuery;
 		String jumpToCommentId = null;
@@ -176,9 +178,13 @@ public void onPause() {
 
 	@Override
 	public void onDestroy() {
-		mPagerAdapter = null;
 
 		super.onDestroy();
+		
+		mPagerAdapter = null;
+		
+		DownloadCommentsTask.clearTasks();
+		DownloadRepliesTask.clearTasks();
 	}
 
 	@Override
@@ -213,7 +219,7 @@ public void updateComments(List<ThingInfo> comments) {
 				break;
 
 			case VOTES:
-				Collections.sort(comments);
+				Collections.sort(comments); 
 				break;
 
 //			case COMMENTS:
@@ -237,8 +243,7 @@ public void updateComments(List<ThingInfo> comments) {
 			mPager.setAdapter(mPagerAdapter);
 			
 			
-			ViewFlipper vf = (ViewFlipper) getView().findViewById(R.id.vf);
-			vf.setDisplayedChild(1);
+	
 			
 			// UPDATE NAV BAR
 			MainActivity act = (MainActivity)getActivity();
@@ -247,8 +252,6 @@ public void updateComments(List<ThingInfo> comments) {
 				act.updateCurrentNavItemDescription(comments.size()+" POSTS");
 			
 			
-			Log.d("yoo", "yooo");
-			
 			// UPDATE MENU ITEMS
 			if (mRefreshMenuItem != null && mLoadingMenuItem != null) {
 				mRefreshMenuItem.setVisible(true);
@@ -455,6 +458,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
 				if( mOPComment != null )
 				{
 					Intent intent = new Intent(getActivity(), CameraActivity.class);
+					mOPComment.setPostPermalink(getArguments().getString(Extras.PERMALINK));
+					mOPComment.setPostTitle(getArguments().getString(Extras.POST_TITLE));
+					mOPComment.setThreadId(mThreadId);
 					intent.putExtra(CameraActivity.Extras.OP_COMMENT, (Parcelable)mOPComment);
 					startActivity(intent);					
 				}
@@ -488,6 +494,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 		return super.onOptionsItemSelected(item);
 	}
 	
+	
 
 
 }
diff --git a/src/com/sobremesa/waywt/listeners/MyPostsListener.java b/src/com/sobremesa/waywt/listeners/MyPostsListener.java
index 106145f..122d055 100644
--- a/src/com/sobremesa/waywt/listeners/MyPostsListener.java
+++ b/src/com/sobremesa/waywt/listeners/MyPostsListener.java
@@ -3,14 +3,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.sobremesa.waywt.model.MyPost;
 import com.sobremesa.waywt.model.ThingInfo;
 
 
 
 public interface MyPostsListener {
-	public void enableLoadingScreen();
-	public void resetUI();
-	public void updateMyPosts(List<MyPost> myPosts);
+	public void onSuccess();
 }
 
diff --git a/src/com/sobremesa/waywt/model/MyPost.java b/src/com/sobremesa/waywt/model/MyPost.java
deleted file mode 100644
index c64a5c5..0000000
--- a/src/com/sobremesa/waywt/model/MyPost.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.sobremesa.waywt.model;
-
-public class MyPost {
-	private ThingInfo mComment;
-	private String mThreadId;
-	
-	public MyPost(ThingInfo comment, String threadId )
-	{
-		this.mComment = comment;
-		this.mThreadId = threadId;
-	}
-	
-	public ThingInfo getComment()
-	{
-		return mComment;
-	}
-	
-	public String getThreadId()
-	{
-		return mThreadId;
-	}
-}
diff --git a/src/com/sobremesa/waywt/model/ThingInfo.java b/src/com/sobremesa/waywt/model/ThingInfo.java
index 7166edd..f15e142 100755
--- a/src/com/sobremesa/waywt/model/ThingInfo.java
+++ b/src/com/sobremesa/waywt/model/ThingInfo.java
@@ -30,6 +30,7 @@
 import android.text.Html;
 import android.text.SpannableString;
 
+import com.sobremesa.waywt.service.RemoteObject;
 import com.sobremesa.waywt.util.MarkdownURL;
 
 /**
@@ -38,7 +39,7 @@
  * @author TalkLittle
  *
  */
-public class ThingInfo implements Serializable, Parcelable, Comparable<ThingInfo> {
+public class ThingInfo extends RemoteObject implements Serializable, Parcelable, Comparable<ThingInfo> {
 	static final long serialVersionUID = 40;
 	
 	// thread: t
@@ -511,6 +512,11 @@ public void writeToParcel(Parcel out, int flags) {
 		booleans[8] = mIsHiddenCommentHead;
 		booleans[9] = mIsHiddenCommentDescendant;
 		out.writeBooleanArray(booleans);
+		
+		// WAYWT
+		out.writeValue(postTitle);
+		out.writeValue(postPermalink);
+		out.writeValue(threadId);
 	}
 
 	private ThingInfo(Parcel in) {
@@ -554,6 +560,12 @@ private ThingInfo(Parcel in) {
 		mIsLoadMoreCommentsPlaceholder = booleans[7];
 		mIsHiddenCommentHead           = booleans[8];
 		mIsHiddenCommentDescendant     = booleans[9];
+		
+		
+		// WAYWT
+		postTitle     = (String) in.readValue(null);
+		postPermalink     = (String) in.readValue(null);
+		threadId     = (String) in.readValue(null);
 	}
 
 	public static final Parcelable.Creator<ThingInfo> CREATOR
@@ -573,4 +585,45 @@ public int compareTo(ThingInfo another) {
 		return (another.ups-another.downs)-(this.ups-this.downs);
 	}
 
+	
+	
+	// WAYWT
+	private String postTitle = "";				
+	private String postPermalink = "";		
+	private String threadId = "";	
+	
+	@Override
+	public String getIdentifier() {
+		return name;
+	}
+	
+	
+	
+	public void setPostTitle( String title )
+	{
+		postTitle = title;
+	}
+	
+	public void setPostPermalink( String permalink )
+	{
+		postPermalink = permalink;
+	}
+	
+	public void setThreadId( String id )
+	{
+		threadId = id;
+	}
+	
+	public String getPostTitle() {
+		return postTitle;
+	}
+	
+	public String getPostPermalink() {
+		return postPermalink;
+	}
+	
+	public String getThreadId() {
+		return threadId;
+	}
+
 }
diff --git a/src/com/sobremesa/waywt/service/synchronizer/CommentPreprocessor.java b/src/com/sobremesa/waywt/service/synchronizer/CommentPreprocessor.java
new file mode 100644
index 0000000..d33679a
--- /dev/null
+++ b/src/com/sobremesa/waywt/service/synchronizer/CommentPreprocessor.java
@@ -0,0 +1,25 @@
+package com.sobremesa.waywt.service.synchronizer;
+
+import java.util.List;
+
+import com.sobremesa.waywt.model.ThingInfo;
+import com.sobremesa.waywt.service.PostService;
+import com.sobremesa.waywt.service.PostService.RemoteRedditPost;
+import com.sobremesa.waywt.service.PostService.RemoteRedditPostData;
+
+
+public class CommentPreprocessor extends RemotePreProcessor<ThingInfo> {
+
+    public CommentPreprocessor() {
+	
+    }
+
+    @Override
+    public void preProcessRemoteRecords(List<ThingInfo> records) {
+//	for (RemoteRedditPostData rep : records) {
+//	    rep.zip = mZip;
+//	    rep.uniqueId = rep.name + "_" + mZip;
+//	}
+    }
+
+}
diff --git a/src/com/sobremesa/waywt/service/synchronizer/CommentSynchronizer.java b/src/com/sobremesa/waywt/service/synchronizer/CommentSynchronizer.java
new file mode 100644
index 0000000..e655a32
--- /dev/null
+++ b/src/com/sobremesa/waywt/service/synchronizer/CommentSynchronizer.java
@@ -0,0 +1,103 @@
+package com.sobremesa.waywt.service.synchronizer;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.DefaultHttpClient;
+
+import com.sobremesa.waywt.contentprovider.Provider;
+import com.sobremesa.waywt.database.tables.CommentTable;
+import com.sobremesa.waywt.database.tables.PostTable;
+import com.sobremesa.waywt.model.ThingInfo;
+import com.sobremesa.waywt.service.PostService;
+
+import android.content.ContentProviderOperation;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.OperationApplicationException;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.RemoteException;
+import android.util.Log;
+import android.widget.Toast;
+
+public class CommentSynchronizer extends Synchronizer<ThingInfo> {
+
+	public CommentSynchronizer(Context context) {
+		super(context);
+	}
+
+	@Override
+	protected void performSynchronizationOperations(Context context, List<ThingInfo> inserts, List<ThingInfo> updates, List<Long> deletions) {
+		ArrayList<ContentProviderOperation> operations = new ArrayList<ContentProviderOperation>();
+
+		for (ThingInfo w : inserts) {
+			ContentValues values = this.getContentValuesForRemoteEntity(w);
+			ContentProviderOperation op = ContentProviderOperation.newInsert(Provider.COMMENT_CONTENT_URI).withValues(values).build();
+			operations.add(op);
+		}
+
+		
+		for (ThingInfo w : updates) {
+			ContentValues values = this.getContentValuesForRemoteEntity(w);
+			ContentProviderOperation op = ContentProviderOperation.newUpdate(Provider.COMMENT_CONTENT_URI).withSelection(CommentTable.NAME + " = ?", new String[] { w.getName() })
+					.withValues(values).build();
+			operations.add(op);
+		}
+
+		for (Long id : deletions) {
+			ContentProviderOperation op = ContentProviderOperation.newDelete(Provider.COMMENT_CONTENT_URI).withSelection(CommentTable.ID + " = ?", new String[] { String.valueOf(id) }).build();
+			operations.add(op);
+		}
+
+		try {
+			if( operations.size() > 0 )
+			{
+				context.getContentResolver().applyBatch(Provider.AUTHORITY, operations);
+			}
+
+		} catch (RemoteException e) {
+			e.printStackTrace();
+		} catch (OperationApplicationException e) {
+			e.printStackTrace();
+		}
+
+	}
+
+	@Override
+	protected boolean isRemoteEntityNewerThanLocal(ThingInfo remote, Cursor c) {
+		// there isn't a versioning mechanism on the service resources so always
+		// consider the remote copy new
+		return true;
+	}
+
+	@Override
+	protected ContentValues getContentValuesForRemoteEntity(ThingInfo t) {
+		ContentValues values = new ContentValues();
+		values.put(CommentTable.POST_TITLE, t.getPostTitle());
+		values.put(CommentTable.POST_PERMALINK, t.getPostPermalink());
+		
+		values.put(CommentTable.COMMENT_ID, t.getId());
+		values.put(CommentTable.AUTHOR, t.getAuthor());
+		values.put(CommentTable.BODY_HTML, t.getBody_html());
+		values.put(CommentTable.NAME, t.getName());
+		values.put(CommentTable.LIKES, t.getLikes() ? 1:0);
+		values.put(CommentTable.UPS, t.getUps());
+		values.put(CommentTable.DOWNS, t.getDowns());
+		
+		return values;
+	}
+
+}
diff --git a/src/com/sobremesa/waywt/service/synchronizer/PostSynchronizer.java b/src/com/sobremesa/waywt/service/synchronizer/PostSynchronizer.java
index b901139..fe06661 100755
--- a/src/com/sobremesa/waywt/service/synchronizer/PostSynchronizer.java
+++ b/src/com/sobremesa/waywt/service/synchronizer/PostSynchronizer.java
@@ -18,7 +18,6 @@
 import org.apache.http.impl.client.DefaultHttpClient;
 
 import com.sobremesa.waywt.contentprovider.Provider;
-import com.sobremesa.waywt.database.tables.ImageTable;
 import com.sobremesa.waywt.database.tables.CommentTable;
 import com.sobremesa.waywt.database.tables.PostTable;
 import com.sobremesa.waywt.service.PostService;
@@ -67,17 +66,13 @@ protected void performSynchronizationOperations(Context context, List<RemoteRedd
 		for (Long id : deletions) {
 			ContentProviderOperation op = ContentProviderOperation.newDelete(Provider.POST_CONTENT_URI).withSelection(PostTable.ID + " = ?", new String[] { String.valueOf(id) }).build();
 			operations.add(op);
-			
-			op = ContentProviderOperation.newDelete(Provider.COMMENT_CONTENT_URI).withSelection(CommentTable.POST_ID + " = ?", new String[] { String.valueOf(id) }).build();
-			operations.add(op);
-			
-			op = ContentProviderOperation.newDelete(Provider.COMMENT_CONTENT_URI).withSelection(ImageTable.POST_ID + " = ?", new String[] { String.valueOf(id) }).build();
-			operations.add(op);
 		}
 
 		try {
 			if( operations.size() > 0 )
+			{
 				context.getContentResolver().applyBatch(Provider.AUTHORITY, operations);
+			}
 
 		} catch (RemoteException e) {
 			e.printStackTrace();
diff --git a/src/com/sobremesa/waywt/tasks/DownloadCommentsTask.java b/src/com/sobremesa/waywt/tasks/DownloadCommentsTask.java
index e661b66..a4a3d51 100755
--- a/src/com/sobremesa/waywt/tasks/DownloadCommentsTask.java
+++ b/src/com/sobremesa/waywt/tasks/DownloadCommentsTask.java
@@ -99,6 +99,13 @@ public DownloadCommentsTask(
 		this.mClient = client;  
 	}
 	
+	public static void clearTasks()
+	{
+		if( mCurrentDownloadCommentsTask != null )
+			mCurrentDownloadCommentsTask.cancel(true);
+		
+		mCurrentDownloadCommentsTask = null;
+	}
 
 	
 	// XXX: maxComments is unused for now
@@ -312,7 +319,8 @@ private void parseCommentsJSON(
      * Call from UI Thread
      */
     private void insertOPCommentUI(ThingInfo comment) {
-    	mListenerRef.get().updateOPComment(comment);
+    	if( mListenerRef.get() != null )
+    		mListenerRef.get().updateOPComment(comment);
     }
     
     
@@ -320,7 +328,8 @@ private void insertOPCommentUI(ThingInfo comment) {
      * Call from UI Thread
      */
     private void insertCommentsUI() {
-    	mListenerRef.get().updateComments(mDeferredAppendList);
+    	if( mListenerRef.get() != null )
+    		mListenerRef.get().updateComments(mDeferredAppendList);
     }
 	
     
diff --git a/src/com/sobremesa/waywt/tasks/DownloadMyPostsTask.java b/src/com/sobremesa/waywt/tasks/DownloadMyPostsTask.java
index bf9111c..5602f34 100644
--- a/src/com/sobremesa/waywt/tasks/DownloadMyPostsTask.java
+++ b/src/com/sobremesa/waywt/tasks/DownloadMyPostsTask.java
@@ -5,6 +5,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.ref.WeakReference;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -20,7 +21,9 @@
 import org.codehaus.jackson.JsonParseException;
 import org.codehaus.jackson.map.ObjectMapper;
 
+import android.Manifest.permission;
 import android.app.Activity;
+import android.database.Cursor;
 import android.os.AsyncTask;
 import android.support.v4.app.Fragment;
 import android.text.Html;
@@ -35,17 +38,28 @@
 import com.sobremesa.waywt.common.Common;
 import com.sobremesa.waywt.common.Constants;
 import com.sobremesa.waywt.common.ProgressInputStream;
+import com.sobremesa.waywt.contentprovider.Provider;
+import com.sobremesa.waywt.database.tables.CommentTable;
+import com.sobremesa.waywt.database.tables.PostTable;
 import com.sobremesa.waywt.fragments.CommentFragment;
 import com.sobremesa.waywt.fragments.WaywtFragment;
 import com.sobremesa.waywt.util.Assert;
 import com.sobremesa.waywt.util.StringUtils;
+import com.sobremesa.waywt.util.UserUtil;
 import com.sobremesa.waywt.util.Util;
 import com.sobremesa.waywt.util.Markdown;
+import com.sobremesa.waywt.service.PostService.RemoteRedditPost;
+import com.sobremesa.waywt.service.synchronizer.CommentPreprocessor;
+import com.sobremesa.waywt.service.synchronizer.CommentSynchronizer;
+import com.sobremesa.waywt.service.synchronizer.PostPreprocessor;
+import com.sobremesa.waywt.service.synchronizer.PostSynchronizer;
+import com.sobremesa.waywt.service.synchronizer.RemotePreProcessor;
+import com.sobremesa.waywt.service.synchronizer.Synchronizer;
 import com.sobremesa.waywt.settings.RedditSettings;
 import com.sobremesa.waywt.listeners.MyPostsListener;
 import com.sobremesa.waywt.model.Listing;
 import com.sobremesa.waywt.model.ListingData;
-import com.sobremesa.waywt.model.MyPost;
+import com.sobremesa.waywt.model.Post;
 import com.sobremesa.waywt.model.ThingInfo;
 import com.sobremesa.waywt.model.ThingListing;
 
@@ -64,6 +78,8 @@ public class DownloadMyPostsTask extends AsyncTask<Integer, Long, Boolean>
     private WeakReference<MyPostsListener> mListenerRef;
     private String mSubreddit;
     private List<String> mThreadIds;
+    private List<String> mPermalinks;
+    private List<String> mTitles;
     private RedditSettings mSettings;
     private HttpClient mClient;
 	
@@ -79,7 +95,7 @@ public class DownloadMyPostsTask extends AsyncTask<Integer, Long, Boolean>
      * List holding the comments to be appended at the end.
      * Used when loading an entire thread.
      */
-    private final LinkedList<MyPost> mDeferredAppendList = new LinkedList<MyPost>();
+    private final LinkedList<ThingInfo> mDeferredAppendList = new LinkedList<ThingInfo>();
 	
 	/**
 	 * Default constructor to do normal comments page
@@ -88,12 +104,16 @@ public DownloadMyPostsTask(
 			MyPostsListener activity,
 			String subreddit,
 			List<String> threadIds,
+			List<String> permalinks,
+			List<String> titles,
 			RedditSettings settings,
 			HttpClient client
 	) {
 		this.mListenerRef = new WeakReference<MyPostsListener>(activity);
 		this.mSubreddit = subreddit;
 		this.mThreadIds = threadIds;
+		this.mPermalinks = permalinks;
+		this.mTitles = titles;
 		this.mSettings = settings;
 		this.mClient = client;  
 	}
@@ -103,10 +123,18 @@ public DownloadMyPostsTask(
 	// XXX: maxComments is unused for now
 	public Boolean doInBackground(Integer... maxComments) {
 		
-		for( String threadId: mThreadIds)
+		List<ThingInfo> myPosts = new ArrayList<ThingInfo>();
+    	InputStream in = null;
+		HttpEntity entity = null;
+		ProgressInputStream pin = null;
+		
+		for( int i=0; i <mThreadIds.size(); ++i )
 		{
 		
-			HttpEntity entity = null;
+			String threadId = mThreadIds.get(i);
+			String title = mTitles.get(i);
+			String permalink = mPermalinks.get(i);
+			
 	        try {
 	        	StringBuilder sb = new StringBuilder(Constants.REDDIT_BASE_URL);
 	    		if (mSubreddit != null) {
@@ -122,7 +150,7 @@ public Boolean doInBackground(Integer... maxComments) {
 	        	sb.append("limit=500&depth=1");
 	        	String url = sb.toString();
 	        	
-	        	InputStream in = null;
+
 	    		boolean currentlyUsingCache = false;
 	    		
 	        	if (Constants.USE_COMMENTS_CACHE) {
@@ -169,14 +197,21 @@ public Boolean doInBackground(Integer... maxComments) {
 	        	}
 	            
 	        	// setup a special InputStream to report progress
-	        	ProgressInputStream pin = new ProgressInputStream(in, mContentLength);
+	        	pin = new ProgressInputStream(in, mContentLength);
 	        	pin.addPropertyChangeListener(this);
 	        	
-	        	parseCommentsJSON(pin, threadId);
+	        	List<ThingInfo> results = parseCommentsJSON(pin, threadId);
+	        	
+	        	for( ThingInfo ci : results )
+	        	{
+	        		ci.setPostPermalink(permalink);
+	        		ci.setPostTitle(title);
+	        		ci.setThreadId(threadId);
+	        		myPosts.add(ci);
+	        	}
+	        	
 	        	if (Constants.LOGGING) Log.d(TAG, "parseCommentsJSON completed");
 	        	
-	        	pin.close();
-	            in.close();
 	            
 	            
 	        } catch (Exception e) {
@@ -192,44 +227,63 @@ public Boolean doInBackground(Integer... maxComments) {
 	    		}
 	        }
 		}
+		
+        try {
+        	pin.close();
+			in.close();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} finally {
+    		if (entity != null) {
+    			try {
+    				entity.consumeContent();
+    			} catch (Exception e2) {
+    				if (Constants.LOGGING) Log.e(TAG, "entity.consumeContent()", e2);  
+    			}
+    		}
+        }
+		
+		if (myPosts != null && myPosts.size() > 0) { 
+			// synchronize!
+			Cursor localRecCursor = WaywtApplication.getContext().getContentResolver().query(Provider.COMMENT_CONTENT_URI, CommentTable.ALL_COLUMNS, CommentTable.AUTHOR + "=?", new String[] { mRedditSettings.getUsername() }, null);
+			localRecCursor.moveToFirst();
+			
+			CommentSynchronizer sync = new CommentSynchronizer( WaywtApplication.getContext());
+			synchronizeRemoteRecords(myPosts, localRecCursor, localRecCursor.getColumnIndex(CommentTable.NAME), sync, new CommentPreprocessor());
+			
+			//
+		} else {
+//			EventBus.getDefault().post(new RecordingServiceEvent(false, "There where no representatives for this zip code"));
+		}
+		
+		if( mListenerRef.get() != null )
+			mListenerRef.get().onSuccess();
+		
         return true;
     }
 	
 	
-	/**
-	 * defer insertion of comment for adding at end of entire comments list
-	 */
-	private void deferCommentAppend(MyPost myPost) {
-		mDeferredAppendList.add(myPost);
+
+
+	public void synchronizeRemoteRecords(List<ThingInfo> remoteReps, Cursor localReps, int remoteIdentifierColumn, Synchronizer<ThingInfo> synchronizer, RemotePreProcessor<ThingInfo> preProcessor) {
+		preProcessor.preProcessRemoteRecords(remoteReps);
+		synchronizer.synchronize(WaywtApplication.getContext(), remoteReps, localReps, remoteIdentifierColumn);
 	}
 	
-	
-	private void disableLoadingScreenKeepProgress() {
-		
-		if( mListenerRef.get() != null )
-		{
-			Activity act = ((Fragment) mListenerRef.get()).getActivity();
-			
-			if( act != null )
-			{
-				((Fragment) mListenerRef.get()).getActivity().runOnUiThread(new Runnable() {
-					@Override
-					public void run() {
-			    		mListenerRef.get().resetUI();
-					}
-				});			
-			}
-		}
 
-	}
 	
-	private void parseCommentsJSON(
+	private List<ThingInfo> parseCommentsJSON(
 			InputStream in, String threadId
 	) throws IOException, JsonParseException {
+		
+		List<ThingInfo> results = new ArrayList<ThingInfo>();
 		int insertedCommentIndex;
 		String genericListingError = "Not a comments listing";
 		try {
-			Listing[] listings = mObjectMapper.readValue(in, Listing[].class);
+
+			
+			Listing[] listings = mObjectMapper.readValue(in, Listing[].class);  
 
 			// listings[0] is a thread Listing for the OP.
 			// process same as a thread listing more or less
@@ -239,7 +293,7 @@ private void parseCommentsJSON(
 			// Save modhash, ignore "after" and "before" which are meaningless in this context (and probably null)
 			ListingData threadListingData = listings[0].getData();
 			if (StringUtils.isEmpty(threadListingData.getModhash()))  
-				mSettings.setModhash(null);
+				mSettings.setModhash(null); 
 			else
 				mSettings.setModhash(threadListingData.getModhash());
 			
@@ -249,9 +303,8 @@ private void parseCommentsJSON(
 			Assert.assertEquals(Constants.THREAD_KIND, threadThingListing.getKind(), genericListingError);
 
 			insertedCommentIndex = 0;  // we just inserted the OP into position 0
+
 			
-			// at this point we've started displaying comments, so disable the loading screen
-			disableLoadingScreenKeepProgress();
 			
 			// listings[1] is a comment Listing for the comments 
 			// Go through the children and get the ThingInfos
@@ -270,7 +323,7 @@ private void parseCommentsJSON(
 					Matcher matcher1 = pattern1.matcher(Html.fromHtml(thingInfo.getBody_html()));  
 					Matcher matcher2 = pattern2.matcher(Html.fromHtml(thingInfo.getBody_html()));
 					Matcher matcher3 = pattern3.matcher(Html.fromHtml(thingInfo.getBody_html()));
-					
+					 
 					boolean one = matcher1.find();
 					boolean two = matcher2.find();
 					boolean three = matcher3.find();
@@ -286,9 +339,7 @@ private void parseCommentsJSON(
 					        	ci.setSpannedBody(spanned);
 							}
 							
-							MyPost myPost = new MyPost(ci, threadId);
-							
-							deferCommentAppend(myPost);
+							results.add(ci);
 						}
 					}
 				}
@@ -298,6 +349,8 @@ private void parseCommentsJSON(
 		} catch (Exception ex) {
 			if (Constants.LOGGING) Log.e(TAG, "parseCommentsJSON", ex);
 		}
+		
+		return results;
 	}
     
     
@@ -305,7 +358,7 @@ private void parseCommentsJSON(
      * Call from UI Thread
      */
     private void insertCommentsUI() {
-    	mListenerRef.get().updateMyPosts(mDeferredAppendList);
+//    	mListenerRef.get().updateMyPosts(mDeferredAppendList);
     }
 	
     
@@ -314,25 +367,24 @@ void cleanupDeferred() {
     	mDeferredAppendList.clear();
     }
     
-    @Override
-	public void onPreExecute() {
-		if (mThreadIds == null) {
-			if (Constants.LOGGING) Log.e(TAG, "mSettings.threadId == null");
-    		this.cancel(true);
-    		return;
-		}
-		synchronized (mCurrentDownloadCommentsTaskLock) {
-    		if (mCurrentDownloadCommentsTask != null) {
-    			mCurrentDownloadCommentsTask.cancel(true);
-    		}
-    		mCurrentDownloadCommentsTask = this;
-		}
-		
-		mListenerRef.get().enableLoadingScreen();
-		
-		if (mContentLength == -1)
-			((Fragment) mListenerRef.get()).getActivity().getWindow().setFeatureInt(Window.FEATURE_PROGRESS, Window.PROGRESS_INDETERMINATE_ON);
-	}
+//    @Override
+//	public void onPreExecute() {
+//		if (mThreadIds == null) {
+//			if (Constants.LOGGING) Log.e(TAG, "mSettings.threadId == null");
+//    		this.cancel(true);
+//    		return;
+//		}
+//		synchronized (mCurrentDownloadCommentsTaskLock) {
+//    		if (mCurrentDownloadCommentsTask != null) {
+//    			mCurrentDownloadCommentsTask.cancel(true);
+//    		}
+//    		mCurrentDownloadCommentsTask = this;
+//		}
+//		
+//		
+//		if (mContentLength == -1)
+//			((Fragment) mListenerRef.get()).getActivity().getWindow().setFeatureInt(Window.FEATURE_PROGRESS, Window.PROGRESS_INDETERMINATE_ON);
+//	}
     
 	@Override
 	public void onPostExecute(Boolean success) {
@@ -351,7 +403,6 @@ public void onPostExecute(Boolean success) {
 			} else {
 				if (!isCancelled()) {
 					Common.showErrorToast("No Internet Connection", Toast.LENGTH_LONG, ((Fragment) mListenerRef.get()).getActivity());
-					mListenerRef.get().resetUI();
 				}
 			}
 		}
@@ -363,17 +414,6 @@ public void onPostExecute(Boolean success) {
 		mListenerRef = null;
 	}
 	
-	@Override
-	public void onProgressUpdate(Long... progress) {
-		
-		if( mListenerRef.get() != null && ((Fragment) mListenerRef.get()).getActivity() != null )
-		{
-			if (mContentLength == -1)
-				((Fragment) mListenerRef.get()).getActivity().getWindow().setFeatureInt(Window.FEATURE_PROGRESS, Window.PROGRESS_INDETERMINATE_ON);
-			else
-				((Fragment) mListenerRef.get()).getActivity().getWindow().setFeatureInt(Window.FEATURE_PROGRESS, progress[0].intValue() * (Window.PROGRESS_END-1) / (int) mContentLength);
-		}
-	}
 	
 	@Override
 	public void propertyChange(PropertyChangeEvent event) {
diff --git a/src/com/sobremesa/waywt/tasks/DownloadRepliesTask.java b/src/com/sobremesa/waywt/tasks/DownloadRepliesTask.java
index ba2647f..a2fcd82 100644
--- a/src/com/sobremesa/waywt/tasks/DownloadRepliesTask.java
+++ b/src/com/sobremesa/waywt/tasks/DownloadRepliesTask.java
@@ -154,6 +154,27 @@ public DownloadRepliesTask(
 			mInc = 0;
 	}
 	
+	public static void clearTasks()
+	{
+		if( mTasks != null )
+		{
+			for( int i = 0 ; i<3; ++i )
+			{
+				ListenerTask task = mTasks[i];
+				
+				if( task != null )
+				{
+					task.mCurrentDownloadCommentsTask.cancel(true);
+				
+					task.mCurrentDownloadCommentsTask = null;
+					task.mListenerReference = null;
+					task = null;
+				}
+			}
+		}
+	}
+	
+	
 	/**
 	 * "load more comments" starting at this position
 	 * @param moreChildrenId The reddit thing-id of the "more" children comment
@@ -284,21 +305,6 @@ private boolean isInsertingEntireThread() {
 		return mPositionOffset == 0;
 	}
 	
-	private void disableLoadingScreenKeepProgress() {
-		
-		Activity act = ((Fragment) mTasks[mIndex].mListenerReference.get()).getActivity();
-		
-		if( act != null )
-		{
-			((Fragment) mTasks[mIndex].mListenerReference.get()).getActivity().runOnUiThread(new Runnable() {
-				@Override
-				public void run() {
-					mTasks[mIndex].mListenerReference.get().resetUI();
-				}
-			});			
-		}
-
-	}
 	
 	private void parseCommentsJSON(
 			InputStream in
@@ -329,8 +335,6 @@ private void parseCommentsJSON(
 				parseOP(threadThingListing.getData());
 				insertedCommentIndex = 0;  // we just inserted the OP into position 0
 				
-				// at this point we've started displaying comments, so disable the loading screen
-				disableLoadingScreenKeepProgress();
 			}
 			else {
 				insertedCommentIndex = mPositionOffset - 1;  // -1 because we +1 for the first comment
@@ -522,16 +526,6 @@ public void onPostExecute(Boolean success) {
 
 	}
 	
-	@Override
-	public void onProgressUpdate(Long... progress) {
-		if( (Fragment) mTasks[mIndex].mListenerReference.get() != null && ((Fragment) mTasks[mIndex].mListenerReference.get()).getActivity() != null)
-		{
-			if (mContentLength == -1)
-				((Fragment) mTasks[mIndex].mListenerReference.get()).getActivity().getWindow().setFeatureInt(Window.FEATURE_PROGRESS, Window.PROGRESS_INDETERMINATE_ON);
-			else
-				((Fragment) mTasks[mIndex].mListenerReference.get()).getActivity().getWindow().setFeatureInt(Window.FEATURE_PROGRESS, progress[0].intValue() * (Window.PROGRESS_END-1) / (int) mContentLength);
-		}  
-	}
 	
 	@Override
 	public void propertyChange(PropertyChangeEvent event) {