diff --git a/app/controllers/api/v1/parties_controller.rb b/app/controllers/api/v1/parties_controller.rb
index e7da4f8..4038648 100644
--- a/app/controllers/api/v1/parties_controller.rb
+++ b/app/controllers/api/v1/parties_controller.rb
@@ -35,6 +35,9 @@ class Api::V1::PartiesController < Api::V1::ApiController
 
     def favorites
         raise Api::V1::UnauthorizedError unless current_user
+        
+        now = DateTime.current
+        start_time = (now - params['recency'].to_i.seconds).to_datetime.beginning_of_day unless request.params['recency'].blank?
 
         conditions = {}
         conditions[:element] = request.params['element'] unless request.params['element'].blank?
diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb
index 46a5990..3b66e41 100644
--- a/app/controllers/api/v1/users_controller.rb
+++ b/app/controllers/api/v1/users_controller.rb
@@ -25,7 +25,22 @@ class Api::V1::UsersController < Api::V1::ApiController
     end
 
     def show
-        @parties = @user.parties
+        if @user
+            now = DateTime.current
+            start_time = (now - params['recency'].to_i.seconds).to_datetime.beginning_of_day unless request.params['recency'].blank?
+
+            conditions = {}
+            conditions[:element] = request.params['element'] unless request.params['element'].blank?
+            conditions[:raid] = request.params['raid'] unless request.params['raid'].blank?
+            conditions[:created_at] = start_time..now unless request.params['recency'].blank? 
+            conditions[:user_id] = @user.id
+
+            @parties = Party.where(conditions).each { |party|
+                party.favorited = (current_user) ? party.is_favorited(current_user) : false
+            }
+        else
+            render_not_found_response
+        end
     end
 
     def check_email
@@ -48,14 +63,6 @@ class Api::V1::UsersController < Api::V1::ApiController
         render :available
     end
 
-    def show
-        if @user
-            @parties = @user.parties
-        else
-            render_not_found_response
-        end
-    end
-
     def update
     end
 
@@ -66,6 +73,7 @@ class Api::V1::UsersController < Api::V1::ApiController
 
     # Specify whitelisted properties that can be modified.
     def set
+        ap "SETTING!!!"
         @user = User.where("username = ?", params[:id]).first
     end