diff --git a/app/build.gradle b/app/build.gradle
index b30c442..e0234bd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,16 @@
 apply plugin: 'com.android.application'
+apply plugin: 'android-apt'
 
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
+    }
+}
 android {
     compileSdkVersion 23
     buildToolsVersion "23.0.1"
@@ -39,4 +50,7 @@ dependencies {
     compile 'com.squareup.retrofit:converter-gson:2.0.0-beta2'
 
     compile 'com.jakewharton:butterknife:7.0.1'
+
+    apt 'net.simonvt.schematic:schematic-compiler:0.6.3'
+    compile 'net.simonvt.schematic:schematic:0.6.3'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index df57679..827d45a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,6 +20,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <provider
+            android:authorities="net.headlezz.udacityproject1.FavoriteProvider"
+            android:name="net.headlezz.udacityproject1.provider.FavoriteProvider"
+            android:exported="false" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/net/headlezz/udacityproject1/MainActivity.java b/app/src/main/java/net/headlezz/udacityproject1/MainActivity.java
index 726c58d..988e6cf 100644
--- a/app/src/main/java/net/headlezz/udacityproject1/MainActivity.java
+++ b/app/src/main/java/net/headlezz/udacityproject1/MainActivity.java
@@ -5,6 +5,7 @@ import android.support.v4.app.FragmentManager;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 
+import net.headlezz.udacityproject1.movielist.MovieListFragment;
 import net.headlezz.udacityproject1.tmdbapi.Movie;
 
 /**
diff --git a/app/src/main/java/net/headlezz/udacityproject1/MovieDetailsFragment.java b/app/src/main/java/net/headlezz/udacityproject1/MovieDetailsFragment.java
index 9e18515..f9514a2 100644
--- a/app/src/main/java/net/headlezz/udacityproject1/MovieDetailsFragment.java
+++ b/app/src/main/java/net/headlezz/udacityproject1/MovieDetailsFragment.java
@@ -19,6 +19,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import net.headlezz.udacityproject1.favorites.FavoriteProviderHelper;
 import net.headlezz.udacityproject1.tmdbapi.Movie;
 import net.headlezz.udacityproject1.tmdbapi.TMDBApi;
 import net.headlezz.udacityproject1.tmdbapi.Video;
@@ -51,6 +52,9 @@ public class MovieDetailsFragment extends Fragment implements Callback<VideoList
     Movie mMovie;
     VideoList mVideoList;
 
+    FavoriteProviderHelper mProvderHelper;
+    boolean isFavorite;
+
     /**
      * Hold a reference to the videolist download call so
      * it can be canceled when stopping
@@ -69,9 +73,11 @@ public class MovieDetailsFragment extends Fragment implements Callback<VideoList
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+        mProvderHelper = new FavoriteProviderHelper(getContext().getContentResolver());
         if(getArguments().containsKey(BUNDLE_ARG_MOVIE)) {
             mMovie = getArguments().getParcelable(BUNDLE_ARG_MOVIE);
             Log.d(TAG, "Bundled movie: " + mMovie.getTitle());
+            isFavorite = mProvderHelper.isFavorite(mMovie); // TODO async?
         } else
             throw new RuntimeException(TAG + " opened without bundled movie!");
 
@@ -165,6 +171,8 @@ public class MovieDetailsFragment extends Fragment implements Callback<VideoList
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         inflater.inflate(R.menu.movie_details_menu, menu);
+        MenuItem favItem = menu.findItem(R.id.action_favorite);
+        favItem.setIcon(isFavorite ? R.drawable.ic_action_star_10 : R.drawable.ic_action_star_0);
     }
 
     @Override
@@ -172,11 +180,26 @@ public class MovieDetailsFragment extends Fragment implements Callback<VideoList
         if(item.getItemId() == R.id.action_share) {
             shareTrailer();
             return true;
+        } else if(item.getItemId() == R.id.action_favorite) {
+            switchFavorite();
+            item.setIcon(isFavorite ? R.drawable.ic_action_star_10 : R.drawable.ic_action_star_0);
+            return true;
         }
         else
             return super.onOptionsItemSelected(item);
     }
 
+    /**
+     * removes or adds the movie to stored favorites
+     */
+    private void switchFavorite() { // TODO async?
+        if(isFavorite)
+            mProvderHelper.removeFavorite(mMovie);
+        else
+            mProvderHelper.addFavorite(mMovie);
+        isFavorite = !isFavorite;
+    }
+
     /**
      * Fires an intent to share the trailer url of this movie
      * Code from http://www.techrepublic.com/blog/software-engineer/get-social-using-android-intents-to-share-a-link/
diff --git a/app/src/main/java/net/headlezz/udacityproject1/favorites/FavoriteColumns.java b/app/src/main/java/net/headlezz/udacityproject1/favorites/FavoriteColumns.java
new file mode 100644
index 0000000..aec83dd
--- /dev/null
+++ b/app/src/main/java/net/headlezz/udacityproject1/favorites/FavoriteColumns.java
@@ -0,0 +1,21 @@
+package net.headlezz.udacityproject1.favorites;
+
+import net.simonvt.schematic.annotation.DataType;
+import net.simonvt.schematic.annotation.NotNull;
+import net.simonvt.schematic.annotation.PrimaryKey;
+
+public interface FavoriteColumns {
+
+    @DataType(DataType.Type.INTEGER) @PrimaryKey String _ID = "_id";
+
+    @DataType(DataType.Type.TEXT) @NotNull String TITLE = "title";
+
+    @DataType(DataType.Type.TEXT) @NotNull String POSTERPATH = "posterpath";
+
+    @DataType(DataType.Type.REAL) @NotNull String AVRATING = "avrating";
+
+    @DataType(DataType.Type.INTEGER) @NotNull String RELEASEDATE = "release";
+
+    @DataType(DataType.Type.TEXT) @NotNull String OVERVIEW = "overview";
+
+}
diff --git a/app/src/main/java/net/headlezz/udacityproject1/favorites/FavoriteDatabase.java b/app/src/main/java/net/headlezz/udacityproject1/favorites/FavoriteDatabase.java
new file mode 100644
index 0000000..ade9484
--- /dev/null
+++ b/app/src/main/java/net/headlezz/udacityproject1/favorites/FavoriteDatabase.java
@@ -0,0 +1,12 @@
+package net.headlezz.udacityproject1.favorites;
+
+import net.simonvt.schematic.annotation.Database;
+import net.simonvt.schematic.annotation.Table;
+
+@Database(version=FavoriteDatabase.VERSION, packageName="net.headlezz.udacityproject1.provider")
+public class FavoriteDatabase {
+
+    public static final int VERSION = 1;
+
+    @Table(FavoriteColumns.class) public static final String favorites = "favorites";
+}
diff --git a/app/src/main/java/net/headlezz/udacityproject1/favorites/FavoriteProvider.java b/app/src/main/java/net/headlezz/udacityproject1/favorites/FavoriteProvider.java
new file mode 100644
index 0000000..7f1cd14
--- /dev/null
+++ b/app/src/main/java/net/headlezz/udacityproject1/favorites/FavoriteProvider.java
@@ -0,0 +1,24 @@
+package net.headlezz.udacityproject1.favorites;
+
+import android.net.Uri;
+
+import net.simonvt.schematic.annotation.ContentProvider;
+import net.simonvt.schematic.annotation.ContentUri;
+import net.simonvt.schematic.annotation.TableEndpoint;
+
+@ContentProvider(authority = FavoriteProvider.AUTHORITY, database = FavoriteDatabase.class, packageName="net.headlezz.udacityproject1.provider")
+public class FavoriteProvider {
+
+    public static final String AUTHORITY = "net.headlezz.udacityproject1.FavoriteProvider";
+    static final Uri BASE_CONTENT_URI = Uri.parse("content://" + AUTHORITY);
+
+    @TableEndpoint(table = FavoriteDatabase.favorites)
+    public static class Favorites {
+
+        @ContentUri(
+                path = "favorites",
+                type = "vnd.android.cursor.dir/list",
+                defaultSort = FavoriteColumns.TITLE + " ASC")
+        public static final Uri FAVORITES_URI = Uri.parse("content://" + AUTHORITY + "/favorites");
+    }
+}
diff --git a/app/src/main/java/net/headlezz/udacityproject1/favorites/FavoriteProviderHelper.java b/app/src/main/java/net/headlezz/udacityproject1/favorites/FavoriteProviderHelper.java
new file mode 100644
index 0000000..c66f7c9
--- /dev/null
+++ b/app/src/main/java/net/headlezz/udacityproject1/favorites/FavoriteProviderHelper.java
@@ -0,0 +1,54 @@
+package net.headlezz.udacityproject1.favorites;
+
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.database.Cursor;
+
+import net.headlezz.udacityproject1.tmdbapi.Movie;
+
+public class FavoriteProviderHelper {
+
+    private ContentResolver mResolver;
+
+    public FavoriteProviderHelper(ContentResolver resolver) {
+        mResolver = resolver;
+    }
+
+    public Cursor getAllFavorites() {
+        String[] projection = {
+                FavoriteColumns._ID,
+                FavoriteColumns.TITLE,
+                FavoriteColumns.POSTERPATH,
+                FavoriteColumns.AVRATING,
+                FavoriteColumns.RELEASEDATE,
+                FavoriteColumns.OVERVIEW
+        };
+        return mResolver.query(FavoriteProvider.Favorites.FAVORITES_URI, projection, null, null, null);
+    }
+
+    public boolean isFavorite(Movie movie) {
+        String[] projection = {FavoriteColumns._ID};
+        String selection = FavoriteColumns.TITLE + "=?";
+        String[] selectionArgs = new String[]{movie.getTitle()};
+        Cursor cursor = mResolver.query(FavoriteProvider.Favorites.FAVORITES_URI, projection, selection, selectionArgs, null);
+        if (cursor != null && cursor.getCount() > 0)
+            return true;
+        return false;
+    }
+
+    public void addFavorite(Movie movie) {
+        ContentValues values = new ContentValues();
+        values.put(FavoriteColumns._ID, movie.getId());
+        values.put(FavoriteColumns.TITLE, movie.getTitle());
+        values.put(FavoriteColumns.OVERVIEW, movie.getOverview());
+        values.put(FavoriteColumns.POSTERPATH, movie.getPosterPath());
+        values.put(FavoriteColumns.AVRATING, movie.getAvRating());
+        values.put(FavoriteColumns.RELEASEDATE, movie.getReleaseDate().getTime());
+        mResolver.insert(FavoriteProvider.Favorites.FAVORITES_URI, values);
+    }
+
+    public void removeFavorite(Movie movie) {
+        mResolver.delete(FavoriteProvider.Favorites.FAVORITES_URI, FavoriteColumns._ID + "=?", new String[]{String.valueOf(movie.getId())});
+    }
+
+}
diff --git a/app/src/main/java/net/headlezz/udacityproject1/MovieListAdapter.java b/app/src/main/java/net/headlezz/udacityproject1/movielist/AbstractMovieListAdapter.java
similarity index 69%
rename from app/src/main/java/net/headlezz/udacityproject1/MovieListAdapter.java
rename to app/src/main/java/net/headlezz/udacityproject1/movielist/AbstractMovieListAdapter.java
index e0bd2e7..1527882 100644
--- a/app/src/main/java/net/headlezz/udacityproject1/MovieListAdapter.java
+++ b/app/src/main/java/net/headlezz/udacityproject1/movielist/AbstractMovieListAdapter.java
@@ -1,4 +1,4 @@
-package net.headlezz.udacityproject1;
+package net.headlezz.udacityproject1.movielist;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -6,20 +6,20 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
+import net.headlezz.udacityproject1.MovieNavigation;
+import net.headlezz.udacityproject1.R;
 import net.headlezz.udacityproject1.tmdbapi.Movie;
-import net.headlezz.udacityproject1.tmdbapi.MovieList;
 import net.headlezz.udacityproject1.tmdbapi.TMDBApi;
 
-import java.util.List;
-
-public class MovieListAdapter extends RecyclerView.Adapter<MovieListAdapter.MovieViewHolder>{
+/**
+ * Abstract class for shwoing a list of movie posters
+ */
+public abstract class AbstractMovieListAdapter extends RecyclerView.Adapter<AbstractMovieListAdapter.MovieViewHolder> {
 
     MovieNavigation mMovieNavigation;
-    List<Movie> mMovies;
 
-    public MovieListAdapter(MovieNavigation mn, MovieList movieList) {
+    public AbstractMovieListAdapter(MovieNavigation mn) {
         mMovieNavigation = mn;
-        mMovies = movieList.getList();
     }
 
     @Override
@@ -30,13 +30,14 @@ public class MovieListAdapter extends RecyclerView.Adapter<MovieListAdapter.Movi
 
     @Override
     public void onBindViewHolder(MovieViewHolder holder, int position) {
-        holder.setMovie(mMovies.get(position));
+        holder.setMovie(getMovieForPosition(position));
     }
 
-    @Override
-    public int getItemCount() {
-        return mMovies.size();
-    }
+    /**
+     * @param position of the list
+     * @return the movie displayed for the given position
+     */
+    protected abstract Movie getMovieForPosition(int position);
 
     /**
      * Viewholder for the movie items
@@ -62,5 +63,4 @@ public class MovieListAdapter extends RecyclerView.Adapter<MovieListAdapter.Movi
             TMDBApi.loadPoster(ivPoster, movie);
         }
     }
-
 }
diff --git a/app/src/main/java/net/headlezz/udacityproject1/movielist/CursorMovieListAdapter.java b/app/src/main/java/net/headlezz/udacityproject1/movielist/CursorMovieListAdapter.java
new file mode 100644
index 0000000..1b3cb36
--- /dev/null
+++ b/app/src/main/java/net/headlezz/udacityproject1/movielist/CursorMovieListAdapter.java
@@ -0,0 +1,82 @@
+package net.headlezz.udacityproject1.movielist;
+
+
+import android.database.Cursor;
+import android.database.DataSetObserver;
+
+import net.headlezz.udacityproject1.MovieNavigation;
+import net.headlezz.udacityproject1.favorites.FavoriteColumns;
+import net.headlezz.udacityproject1.tmdbapi.Movie;
+
+/**
+ * MovieListAdapter implementation for showing movies from a cursor
+ * Modified version of https://gist.github.com/skyfishjy/443b7448f59be978bc59
+ */
+public class CursorMovieListAdapter extends AbstractMovieListAdapter {
+
+    private Cursor mCursor;
+    private boolean mDataValid;
+    private int mRowIdColumn;
+    private DataSetObserver mDataSetObserver;
+
+    public CursorMovieListAdapter(Cursor cursor, MovieNavigation mn) {
+        super(mn);
+        mCursor = cursor;
+        mDataValid = cursor != null;
+        mRowIdColumn = mDataValid ? mCursor.getColumnIndex(FavoriteColumns._ID) : -1;
+        mDataSetObserver = new NotifyingDataSetObserver();
+        if (mCursor != null) {
+            mCursor.registerDataSetObserver(mDataSetObserver);
+        }
+    }
+
+    @Override
+    protected Movie getMovieForPosition(int position) {
+        if (!mDataValid) {
+            throw new IllegalStateException("this should only be called when the cursor is valid");
+        }
+        if (!mCursor.moveToPosition(position)) {
+            throw new IllegalStateException("couldn't move cursor to position " + position);
+        }
+
+        return Movie.fromCurrentCursorPosition(mCursor);
+    }
+
+    @Override
+    public int getItemCount() {
+        if (mDataValid && mCursor != null) {
+            return mCursor.getCount();
+        }
+        return 0;
+    }
+
+    @Override
+    public long getItemId(int position) {
+        if (mDataValid && mCursor != null && mCursor.moveToPosition(position)) {
+            return mCursor.getLong(mRowIdColumn);
+        }
+        return 0;
+    }
+
+    @Override
+    public void setHasStableIds(boolean hasStableIds) {
+        super.setHasStableIds(true);
+    }
+
+    private class NotifyingDataSetObserver extends DataSetObserver {
+        @Override
+        public void onChanged() {
+            super.onChanged();
+            mDataValid = true;
+            notifyDataSetChanged();
+        }
+
+        @Override
+        public void onInvalidated() {
+            super.onInvalidated();
+            mDataValid = false;
+            notifyDataSetChanged();
+            //There is no notifyDataSetInvalidated() method in RecyclerView.Adapter
+        }
+    }
+}
diff --git a/app/src/main/java/net/headlezz/udacityproject1/movielist/MovieListAdapter.java b/app/src/main/java/net/headlezz/udacityproject1/movielist/MovieListAdapter.java
new file mode 100644
index 0000000..db669b2
--- /dev/null
+++ b/app/src/main/java/net/headlezz/udacityproject1/movielist/MovieListAdapter.java
@@ -0,0 +1,30 @@
+package net.headlezz.udacityproject1.movielist;
+
+import net.headlezz.udacityproject1.MovieNavigation;
+import net.headlezz.udacityproject1.tmdbapi.Movie;
+import net.headlezz.udacityproject1.tmdbapi.MovieList;
+
+import java.util.List;
+
+/**
+ * MovieListAdapter implementation for showing movies from a list of movies
+ */
+public class MovieListAdapter extends AbstractMovieListAdapter {
+
+    List<Movie> mMovies;
+
+    public MovieListAdapter(MovieNavigation mn, MovieList movieList) {
+        super(mn);
+        mMovies = movieList.getList();
+    }
+
+    @Override
+    public int getItemCount() {
+        return mMovies.size();
+    }
+
+    @Override
+    protected Movie getMovieForPosition(int position) {
+        return mMovies.get(position);
+    }
+}
diff --git a/app/src/main/java/net/headlezz/udacityproject1/MovieListFragment.java b/app/src/main/java/net/headlezz/udacityproject1/movielist/MovieListFragment.java
similarity index 80%
rename from app/src/main/java/net/headlezz/udacityproject1/MovieListFragment.java
rename to app/src/main/java/net/headlezz/udacityproject1/movielist/MovieListFragment.java
index 1e242c7..5ddc32c 100644
--- a/app/src/main/java/net/headlezz/udacityproject1/MovieListFragment.java
+++ b/app/src/main/java/net/headlezz/udacityproject1/movielist/MovieListFragment.java
@@ -1,7 +1,8 @@
-package net.headlezz.udacityproject1;
+package net.headlezz.udacityproject1.movielist;
 
 import android.content.Context;
 import android.content.res.Configuration;
+import android.database.Cursor;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.GridLayoutManager;
@@ -16,6 +17,9 @@ import android.view.ViewGroup;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
+import net.headlezz.udacityproject1.MovieNavigation;
+import net.headlezz.udacityproject1.R;
+import net.headlezz.udacityproject1.favorites.FavoriteProviderHelper;
 import net.headlezz.udacityproject1.tmdbapi.MovieList;
 import net.headlezz.udacityproject1.tmdbapi.TMDBApi;
 
@@ -42,7 +46,11 @@ public class MovieListFragment extends Fragment implements Callback<MovieList> {
      * The currently selected sorting order of the list
      * @see TMDBApi
      */
-    private int mSortingOrder = TMDBApi.SORT_ORDER_MOST_POPULAR;
+    private int mSortingOrder = SORT_ORDER_MOST_POPULAR;
+
+    public static final int SORT_ORDER_MOST_POPULAR = TMDBApi.SORT_ORDER_MOST_POPULAR;
+    public static final int SORT_ORDER_HIGHEST_RATED = TMDBApi.SORT_ORDER_HIGHEST_RATED;
+    public static final int SORT_ORDER_FAVORITES = 3;
 
     private MovieList mMovieList;
 
@@ -120,11 +128,15 @@ public class MovieListFragment extends Fragment implements Callback<MovieList> {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.action_sort_popularity:
-                mSortingOrder = TMDBApi.SORT_ORDER_MOST_POPULAR;
+                mSortingOrder = SORT_ORDER_MOST_POPULAR;
                 loadMovieList();
                 return true;
             case R.id.action_sort_rating:
-                mSortingOrder = TMDBApi.SORT_ORDER_HIGHEST_RATED;
+                mSortingOrder = SORT_ORDER_HIGHEST_RATED;
+                loadMovieList();
+                return true;
+            case R.id.action_sort_favorites:
+                mSortingOrder = SORT_ORDER_FAVORITES;
                 loadMovieList();
                 return true;
             default:
@@ -138,9 +150,18 @@ public class MovieListFragment extends Fragment implements Callback<MovieList> {
      */
     private void loadMovieList() {
         stopLoadingMovies(); // stop any running query before starting a new one
-        mProgressBar.setVisibility(View.VISIBLE);
-        mMovieListCall = TMDBApi.discoverMovies(mSortingOrder, getString(R.string.api_key));
-        mMovieListCall.enqueue(this);
+        if(mSortingOrder != SORT_ORDER_FAVORITES) {
+            mProgressBar.setVisibility(View.VISIBLE);
+            mMovieListCall = TMDBApi.discoverMovies(mSortingOrder, getString(R.string.api_key));
+            mMovieListCall.enqueue(this);
+        } else
+            loadMovieListFromFavorites();
+    }
+
+    private void loadMovieListFromFavorites() {
+        // TODO async?
+        Cursor cursor = new FavoriteProviderHelper(getContext().getContentResolver()).getAllFavorites();
+        mMovieGridView.setAdapter(new CursorMovieListAdapter(cursor,(MovieNavigation) getActivity()));
     }
 
     @Override
@@ -190,7 +211,7 @@ public class MovieListFragment extends Fragment implements Callback<MovieList> {
     @Override
     public void onSaveInstanceState(Bundle outState) {
         outState.putInt("sort_order", mSortingOrder);
-        if(mMovieList != null)
+        if(mMovieList != null && mSortingOrder != SORT_ORDER_FAVORITES)
             outState.putParcelable("movielist", mMovieList);
         super.onSaveInstanceState(outState);
     }
diff --git a/app/src/main/java/net/headlezz/udacityproject1/tmdbapi/Movie.java b/app/src/main/java/net/headlezz/udacityproject1/tmdbapi/Movie.java
index 32f4ea6..b18d49a 100644
--- a/app/src/main/java/net/headlezz/udacityproject1/tmdbapi/Movie.java
+++ b/app/src/main/java/net/headlezz/udacityproject1/tmdbapi/Movie.java
@@ -1,10 +1,13 @@
 package net.headlezz.udacityproject1.tmdbapi;
 
+import android.database.Cursor;
 import android.os.Parcel;
 import android.os.Parcelable;
 
 import com.google.gson.annotations.SerializedName;
 
+import net.headlezz.udacityproject1.favorites.FavoriteColumns;
+
 import java.util.Date;
 
 /**
@@ -55,6 +58,17 @@ public class Movie implements Parcelable {
         return id;
     }
 
+    public static Movie fromCurrentCursorPosition(Cursor cursor) {
+        Movie movie = new Movie();
+        movie.id = cursor.getLong(cursor.getColumnIndex(FavoriteColumns._ID));
+        movie.title = cursor.getString(cursor.getColumnIndex(FavoriteColumns.TITLE));
+        movie.posterPath = cursor.getString(cursor.getColumnIndex(FavoriteColumns.POSTERPATH));
+        movie.overview = cursor.getString(cursor.getColumnIndex(FavoriteColumns.OVERVIEW));
+        movie.releaseDate = new Date(cursor.getLong(cursor.getColumnIndex(FavoriteColumns.RELEASEDATE)));
+        movie.avRating = cursor.getDouble(cursor.getColumnIndex(FavoriteColumns.AVRATING));
+        return movie;
+    }
+
     /**** Parcelable stuff *****/
 
     @Override
diff --git a/app/src/main/res/drawable-hdpi/ic_action_star_0.png b/app/src/main/res/drawable-hdpi/ic_action_star_0.png
new file mode 100644
index 0000000..7767483
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_star_0.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_star_10.png b/app/src/main/res/drawable-hdpi/ic_action_star_10.png
new file mode 100644
index 0000000..d44cddb
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_star_10.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_action_star_0.png b/app/src/main/res/drawable-ldpi/ic_action_star_0.png
new file mode 100644
index 0000000..c9bdc90
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_action_star_0.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_action_star_10.png b/app/src/main/res/drawable-ldpi/ic_action_star_10.png
new file mode 100644
index 0000000..237d66c
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_action_star_10.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_star_0.png b/app/src/main/res/drawable-mdpi/ic_action_star_0.png
new file mode 100644
index 0000000..2d79c98
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_star_0.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_star_10.png b/app/src/main/res/drawable-mdpi/ic_action_star_10.png
new file mode 100644
index 0000000..dc6455c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_star_10.png differ
diff --git a/app/src/main/res/drawable-tvdpi/ic_action_star_0.png b/app/src/main/res/drawable-tvdpi/ic_action_star_0.png
new file mode 100644
index 0000000..85f7bee
Binary files /dev/null and b/app/src/main/res/drawable-tvdpi/ic_action_star_0.png differ
diff --git a/app/src/main/res/drawable-tvdpi/ic_action_star_10.png b/app/src/main/res/drawable-tvdpi/ic_action_star_10.png
new file mode 100644
index 0000000..ff55be8
Binary files /dev/null and b/app/src/main/res/drawable-tvdpi/ic_action_star_10.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_star_0.png b/app/src/main/res/drawable-xhdpi/ic_action_star_0.png
new file mode 100644
index 0000000..fd4a180
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_star_0.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_star_10.png b/app/src/main/res/drawable-xhdpi/ic_action_star_10.png
new file mode 100644
index 0000000..c9f8032
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_star_10.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_star_0.png b/app/src/main/res/drawable-xxhdpi/ic_action_star_0.png
new file mode 100644
index 0000000..f1773b7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_star_0.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_star_10.png b/app/src/main/res/drawable-xxhdpi/ic_action_star_10.png
new file mode 100644
index 0000000..06992cb
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_star_10.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_star_0.png b/app/src/main/res/drawable-xxxhdpi/ic_action_star_0.png
new file mode 100644
index 0000000..12252d2
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_action_star_0.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_star_10.png b/app/src/main/res/drawable-xxxhdpi/ic_action_star_10.png
new file mode 100644
index 0000000..3c987ba
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_action_star_10.png differ
diff --git a/app/src/main/res/menu/movie_details_menu.xml b/app/src/main/res/menu/movie_details_menu.xml
index 44c027e..979805a 100644
--- a/app/src/main/res/menu/movie_details_menu.xml
+++ b/app/src/main/res/menu/movie_details_menu.xml
@@ -2,4 +2,5 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:icon="@drawable/ic_action_share" android:id="@+id/action_share" android:title="Share" app:showAsAction="ifRoom" />
+    <item android:id="@+id/action_favorite" android:title="Add/Remove Favorite" app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/movie_list_menu.xml b/app/src/main/res/menu/movie_list_menu.xml
index f3d4645..5fbf231 100644
--- a/app/src/main/res/menu/movie_list_menu.xml
+++ b/app/src/main/res/menu/movie_list_menu.xml
@@ -1,6 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools" tools:context=".MainActivity">
-    <item android:id="@+id/action_sort_popularity" android:title="Sort by popularity" app:showAsAction="never" />
-    <item android:id="@+id/action_sort_rating" android:title="Sort by av. rating" app:showAsAction="never" />
+    <item android:id="@+id/action_sort_popularity" android:title="Popular movies" app:showAsAction="never" />
+    <item android:id="@+id/action_sort_rating" android:title="Highest av. rating" app:showAsAction="never" />
+    <item android:id="@+id/action_sort_favorites" android:title="Favorites" app:showAsAction="never" />
 </menu>