diff --git a/GetHip/HomeScreenViewController.swift b/GetHip/HomeScreenViewController.swift
index 100cd97..7079e8e 100644
--- a/GetHip/HomeScreenViewController.swift
+++ b/GetHip/HomeScreenViewController.swift
@@ -81,6 +81,7 @@ class HomeScreenViewController: UIViewController, PartyServiceManagerDelegate {
         self.partyData = (self.tabBarController as? HomeTabController)!.partyData
         self.friendData = (self.tabBarController as? HomeTabController)!.friendData
         self.requestData = (self.tabBarController as? HomeTabController)!.requestData
+        self.partyData.delegate = self
     }
     
     
diff --git a/GetHip/Images-3.xcassets/CurrentlyPlaying/HomeButton.imageset/Contents.json b/GetHip/Images-3.xcassets/CurrentlyPlaying/HomeButton.imageset/Contents.json
new file mode 100644
index 0000000..1685b17
--- /dev/null
+++ b/GetHip/Images-3.xcassets/CurrentlyPlaying/HomeButton.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Home Copy@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "Home Copy@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/CurrentlyPlaying/HomeButton.imageset/Home Copy@2x.png b/GetHip/Images-3.xcassets/CurrentlyPlaying/HomeButton.imageset/Home Copy@2x.png
new file mode 100644
index 0000000..aa8f59f
Binary files /dev/null and b/GetHip/Images-3.xcassets/CurrentlyPlaying/HomeButton.imageset/Home Copy@2x.png differ
diff --git a/GetHip/Images-3.xcassets/CurrentlyPlaying/HomeButton.imageset/Home Copy@3x.png b/GetHip/Images-3.xcassets/CurrentlyPlaying/HomeButton.imageset/Home Copy@3x.png
new file mode 100644
index 0000000..d42ccc0
Binary files /dev/null and b/GetHip/Images-3.xcassets/CurrentlyPlaying/HomeButton.imageset/Home Copy@3x.png differ
diff --git a/GetHip/Images-3.xcassets/CurrentlyPlaying/PauseButton.imageset/Contents.json b/GetHip/Images-3.xcassets/CurrentlyPlaying/PauseButton.imageset/Contents.json
new file mode 100644
index 0000000..7809281
--- /dev/null
+++ b/GetHip/Images-3.xcassets/CurrentlyPlaying/PauseButton.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Pause-52.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/CurrentlyPlaying/PauseButton.imageset/Pause-52.png b/GetHip/Images-3.xcassets/CurrentlyPlaying/PauseButton.imageset/Pause-52.png
new file mode 100644
index 0000000..ad72b9c
Binary files /dev/null and b/GetHip/Images-3.xcassets/CurrentlyPlaying/PauseButton.imageset/Pause-52.png differ
diff --git a/GetHip/Images-3.xcassets/CurrentlyPlaying/PlayButton.imageset/Contents.json b/GetHip/Images-3.xcassets/CurrentlyPlaying/PlayButton.imageset/Contents.json
new file mode 100644
index 0000000..9c7f2e5
--- /dev/null
+++ b/GetHip/Images-3.xcassets/CurrentlyPlaying/PlayButton.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Play-52.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/CurrentlyPlaying/PlayButton.imageset/Play-52.png b/GetHip/Images-3.xcassets/CurrentlyPlaying/PlayButton.imageset/Play-52.png
new file mode 100644
index 0000000..4b41d3c
Binary files /dev/null and b/GetHip/Images-3.xcassets/CurrentlyPlaying/PlayButton.imageset/Play-52.png differ
diff --git a/GetHip/Images-3.xcassets/FriendRequests/SendFriendRequest.imageset/Contents.json b/GetHip/Images-3.xcassets/FriendRequests/SendFriendRequest.imageset/Contents.json
new file mode 100644
index 0000000..902d232
--- /dev/null
+++ b/GetHip/Images-3.xcassets/FriendRequests/SendFriendRequest.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "Send.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Send@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "Send@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/FriendRequests/SendFriendRequest.imageset/Send.png b/GetHip/Images-3.xcassets/FriendRequests/SendFriendRequest.imageset/Send.png
new file mode 100644
index 0000000..4199b97
Binary files /dev/null and b/GetHip/Images-3.xcassets/FriendRequests/SendFriendRequest.imageset/Send.png differ
diff --git a/GetHip/Images-3.xcassets/FriendRequests/SendFriendRequest.imageset/Send@2x.png b/GetHip/Images-3.xcassets/FriendRequests/SendFriendRequest.imageset/Send@2x.png
new file mode 100644
index 0000000..dfb0ddb
Binary files /dev/null and b/GetHip/Images-3.xcassets/FriendRequests/SendFriendRequest.imageset/Send@2x.png differ
diff --git a/GetHip/Images-3.xcassets/FriendRequests/SendFriendRequest.imageset/Send@3x.png b/GetHip/Images-3.xcassets/FriendRequests/SendFriendRequest.imageset/Send@3x.png
new file mode 100644
index 0000000..7816541
Binary files /dev/null and b/GetHip/Images-3.xcassets/FriendRequests/SendFriendRequest.imageset/Send@3x.png differ
diff --git a/GetHip/Images-3.xcassets/HomeScreen/HomeScreenCreate.imageset/Contents.json b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenCreate.imageset/Contents.json
new file mode 100644
index 0000000..1208b53
--- /dev/null
+++ b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenCreate.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "Create.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Create@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "Create@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/HomeScreen/HomeScreenCreate.imageset/Create.png b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenCreate.imageset/Create.png
new file mode 100644
index 0000000..cfe789d
Binary files /dev/null and b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenCreate.imageset/Create.png differ
diff --git a/GetHip/Images-3.xcassets/HomeScreen/HomeScreenCreate.imageset/Create@2x.png b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenCreate.imageset/Create@2x.png
new file mode 100644
index 0000000..cf9afc9
Binary files /dev/null and b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenCreate.imageset/Create@2x.png differ
diff --git a/GetHip/Images-3.xcassets/HomeScreen/HomeScreenCreate.imageset/Create@3x.png b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenCreate.imageset/Create@3x.png
new file mode 100644
index 0000000..747fecb
Binary files /dev/null and b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenCreate.imageset/Create@3x.png differ
diff --git a/GetHip/Images-3.xcassets/HomeScreen/HomeScreenFULL.imageset/Contents.json b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenFULL.imageset/Contents.json
new file mode 100644
index 0000000..63da09e
--- /dev/null
+++ b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenFULL.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Size Ref.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/HomeScreen/HomeScreenFULL.imageset/Size Ref.png b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenFULL.imageset/Size Ref.png
new file mode 100644
index 0000000..77b39ba
Binary files /dev/null and b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenFULL.imageset/Size Ref.png differ
diff --git a/GetHip/Images-3.xcassets/HomeScreen/HomeScreenStar.imageset/Contents.json b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenStar.imageset/Contents.json
new file mode 100644
index 0000000..b0336cb
--- /dev/null
+++ b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenStar.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "Star.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Star@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "Star@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/HomeScreen/HomeScreenStar.imageset/Star.png b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenStar.imageset/Star.png
new file mode 100644
index 0000000..c0bba42
Binary files /dev/null and b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenStar.imageset/Star.png differ
diff --git a/GetHip/Images-3.xcassets/HomeScreen/HomeScreenStar.imageset/Star@2x.png b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenStar.imageset/Star@2x.png
new file mode 100644
index 0000000..16bbc9a
Binary files /dev/null and b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenStar.imageset/Star@2x.png differ
diff --git a/GetHip/Images-3.xcassets/HomeScreen/HomeScreenStar.imageset/Star@3x.png b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenStar.imageset/Star@3x.png
new file mode 100644
index 0000000..32fc89c
Binary files /dev/null and b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenStar.imageset/Star@3x.png differ
diff --git a/GetHip/Images-3.xcassets/HomeScreen/HomeScreenTurnTable.imageset/Contents.json b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenTurnTable.imageset/Contents.json
new file mode 100644
index 0000000..d30dc26
--- /dev/null
+++ b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenTurnTable.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Turntable@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "Turntable@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/HomeScreen/HomeScreenTurnTable.imageset/Turntable@2x.png b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenTurnTable.imageset/Turntable@2x.png
new file mode 100644
index 0000000..267a201
Binary files /dev/null and b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenTurnTable.imageset/Turntable@2x.png differ
diff --git a/GetHip/Images-3.xcassets/HomeScreen/HomeScreenTurnTable.imageset/Turntable@3x.png b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenTurnTable.imageset/Turntable@3x.png
new file mode 100644
index 0000000..83ee49b
Binary files /dev/null and b/GetHip/Images-3.xcassets/HomeScreen/HomeScreenTurnTable.imageset/Turntable@3x.png differ
diff --git a/GetHip/Images-3.xcassets/InParty/AddMore.imageset/Add More.png b/GetHip/Images-3.xcassets/InParty/AddMore.imageset/Add More.png
new file mode 100644
index 0000000..67b4fcc
Binary files /dev/null and b/GetHip/Images-3.xcassets/InParty/AddMore.imageset/Add More.png differ
diff --git a/GetHip/Images-3.xcassets/InParty/AddMore.imageset/Add More@2x.png b/GetHip/Images-3.xcassets/InParty/AddMore.imageset/Add More@2x.png
new file mode 100644
index 0000000..118e1f8
Binary files /dev/null and b/GetHip/Images-3.xcassets/InParty/AddMore.imageset/Add More@2x.png differ
diff --git a/GetHip/Images-3.xcassets/InParty/AddMore.imageset/Add More@3x.png b/GetHip/Images-3.xcassets/InParty/AddMore.imageset/Add More@3x.png
new file mode 100644
index 0000000..9484473
Binary files /dev/null and b/GetHip/Images-3.xcassets/InParty/AddMore.imageset/Add More@3x.png differ
diff --git a/GetHip/Images-3.xcassets/InParty/AddMore.imageset/Contents.json b/GetHip/Images-3.xcassets/InParty/AddMore.imageset/Contents.json
new file mode 100644
index 0000000..197f19c
--- /dev/null
+++ b/GetHip/Images-3.xcassets/InParty/AddMore.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "Add More.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Add More@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "Add More@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/InvitedToJoin/CheckMark.imageset/Accept.png b/GetHip/Images-3.xcassets/InvitedToJoin/CheckMark.imageset/Accept.png
new file mode 100644
index 0000000..6f5c716
Binary files /dev/null and b/GetHip/Images-3.xcassets/InvitedToJoin/CheckMark.imageset/Accept.png differ
diff --git a/GetHip/Images-3.xcassets/InvitedToJoin/CheckMark.imageset/Accept@2x.png b/GetHip/Images-3.xcassets/InvitedToJoin/CheckMark.imageset/Accept@2x.png
new file mode 100644
index 0000000..6b78c4b
Binary files /dev/null and b/GetHip/Images-3.xcassets/InvitedToJoin/CheckMark.imageset/Accept@2x.png differ
diff --git a/GetHip/Images-3.xcassets/InvitedToJoin/CheckMark.imageset/Accept@3x.png b/GetHip/Images-3.xcassets/InvitedToJoin/CheckMark.imageset/Accept@3x.png
new file mode 100644
index 0000000..8c025c5
Binary files /dev/null and b/GetHip/Images-3.xcassets/InvitedToJoin/CheckMark.imageset/Accept@3x.png differ
diff --git a/GetHip/Images-3.xcassets/InvitedToJoin/CheckMark.imageset/Contents.json b/GetHip/Images-3.xcassets/InvitedToJoin/CheckMark.imageset/Contents.json
new file mode 100644
index 0000000..e39be21
--- /dev/null
+++ b/GetHip/Images-3.xcassets/InvitedToJoin/CheckMark.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "Accept.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Accept@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "Accept@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/InvitedToJoin/FriendsIcon.imageset/Contents.json b/GetHip/Images-3.xcassets/InvitedToJoin/FriendsIcon.imageset/Contents.json
new file mode 100644
index 0000000..44a6827
--- /dev/null
+++ b/GetHip/Images-3.xcassets/InvitedToJoin/FriendsIcon.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "Group.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Group@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "Group@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/InvitedToJoin/FriendsIcon.imageset/Group.png b/GetHip/Images-3.xcassets/InvitedToJoin/FriendsIcon.imageset/Group.png
new file mode 100644
index 0000000..585d2d5
Binary files /dev/null and b/GetHip/Images-3.xcassets/InvitedToJoin/FriendsIcon.imageset/Group.png differ
diff --git a/GetHip/Images-3.xcassets/InvitedToJoin/FriendsIcon.imageset/Group@2x.png b/GetHip/Images-3.xcassets/InvitedToJoin/FriendsIcon.imageset/Group@2x.png
new file mode 100644
index 0000000..90b82dc
Binary files /dev/null and b/GetHip/Images-3.xcassets/InvitedToJoin/FriendsIcon.imageset/Group@2x.png differ
diff --git a/GetHip/Images-3.xcassets/InvitedToJoin/FriendsIcon.imageset/Group@3x.png b/GetHip/Images-3.xcassets/InvitedToJoin/FriendsIcon.imageset/Group@3x.png
new file mode 100644
index 0000000..e6d96ca
Binary files /dev/null and b/GetHip/Images-3.xcassets/InvitedToJoin/FriendsIcon.imageset/Group@3x.png differ
diff --git a/GetHip/Images-3.xcassets/InvitedToJoin/InvitedToJoinFULL.imageset/Contents.json b/GetHip/Images-3.xcassets/InvitedToJoin/InvitedToJoinFULL.imageset/Contents.json
new file mode 100644
index 0000000..f62e94a
--- /dev/null
+++ b/GetHip/Images-3.xcassets/InvitedToJoin/InvitedToJoinFULL.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Pro Pic.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/InvitedToJoin/InvitedToJoinFULL.imageset/Pro Pic.png b/GetHip/Images-3.xcassets/InvitedToJoin/InvitedToJoinFULL.imageset/Pro Pic.png
new file mode 100644
index 0000000..9f13861
Binary files /dev/null and b/GetHip/Images-3.xcassets/InvitedToJoin/InvitedToJoinFULL.imageset/Pro Pic.png differ
diff --git a/GetHip/Images-3.xcassets/InvitedToJoin/SettingsIcon.imageset/Contents.json b/GetHip/Images-3.xcassets/InvitedToJoin/SettingsIcon.imageset/Contents.json
new file mode 100644
index 0000000..3e06229
--- /dev/null
+++ b/GetHip/Images-3.xcassets/InvitedToJoin/SettingsIcon.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Group@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "Group@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/InvitedToJoin/SettingsIcon.imageset/Group@2x.png b/GetHip/Images-3.xcassets/InvitedToJoin/SettingsIcon.imageset/Group@2x.png
new file mode 100644
index 0000000..194813a
Binary files /dev/null and b/GetHip/Images-3.xcassets/InvitedToJoin/SettingsIcon.imageset/Group@2x.png differ
diff --git a/GetHip/Images-3.xcassets/InvitedToJoin/SettingsIcon.imageset/Group@3x.png b/GetHip/Images-3.xcassets/InvitedToJoin/SettingsIcon.imageset/Group@3x.png
new file mode 100644
index 0000000..88d8a3a
Binary files /dev/null and b/GetHip/Images-3.xcassets/InvitedToJoin/SettingsIcon.imageset/Group@3x.png differ
diff --git a/GetHip/Images-3.xcassets/InvitedToJoin/XMark.imageset/Cancel.png b/GetHip/Images-3.xcassets/InvitedToJoin/XMark.imageset/Cancel.png
new file mode 100644
index 0000000..8f05dcf
Binary files /dev/null and b/GetHip/Images-3.xcassets/InvitedToJoin/XMark.imageset/Cancel.png differ
diff --git a/GetHip/Images-3.xcassets/InvitedToJoin/XMark.imageset/Cancel@2x.png b/GetHip/Images-3.xcassets/InvitedToJoin/XMark.imageset/Cancel@2x.png
new file mode 100644
index 0000000..69aa181
Binary files /dev/null and b/GetHip/Images-3.xcassets/InvitedToJoin/XMark.imageset/Cancel@2x.png differ
diff --git a/GetHip/Images-3.xcassets/InvitedToJoin/XMark.imageset/Cancel@3x.png b/GetHip/Images-3.xcassets/InvitedToJoin/XMark.imageset/Cancel@3x.png
new file mode 100644
index 0000000..f43dbe7
Binary files /dev/null and b/GetHip/Images-3.xcassets/InvitedToJoin/XMark.imageset/Cancel@3x.png differ
diff --git a/GetHip/Images-3.xcassets/InvitedToJoin/XMark.imageset/Contents.json b/GetHip/Images-3.xcassets/InvitedToJoin/XMark.imageset/Contents.json
new file mode 100644
index 0000000..e5568da
--- /dev/null
+++ b/GetHip/Images-3.xcassets/InvitedToJoin/XMark.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "Cancel.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Cancel@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "Cancel@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/JoingAParty/JoingAParty.imageset/Contents.json b/GetHip/Images-3.xcassets/JoingAParty/JoingAParty.imageset/Contents.json
new file mode 100644
index 0000000..ee6310a
--- /dev/null
+++ b/GetHip/Images-3.xcassets/JoingAParty/JoingAParty.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "Joining.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Joining@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "Joining@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/JoingAParty/JoingAParty.imageset/Joining.png b/GetHip/Images-3.xcassets/JoingAParty/JoingAParty.imageset/Joining.png
new file mode 100644
index 0000000..97ce8ce
Binary files /dev/null and b/GetHip/Images-3.xcassets/JoingAParty/JoingAParty.imageset/Joining.png differ
diff --git a/GetHip/Images-3.xcassets/JoingAParty/JoingAParty.imageset/Joining@2x.png b/GetHip/Images-3.xcassets/JoingAParty/JoingAParty.imageset/Joining@2x.png
new file mode 100644
index 0000000..78364ed
Binary files /dev/null and b/GetHip/Images-3.xcassets/JoingAParty/JoingAParty.imageset/Joining@2x.png differ
diff --git a/GetHip/Images-3.xcassets/JoingAParty/JoingAParty.imageset/Joining@3x.png b/GetHip/Images-3.xcassets/JoingAParty/JoingAParty.imageset/Joining@3x.png
new file mode 100644
index 0000000..77d4ecc
Binary files /dev/null and b/GetHip/Images-3.xcassets/JoingAParty/JoingAParty.imageset/Joining@3x.png differ
diff --git a/GetHip/Images-3.xcassets/JoingAParty/JoingAPartyFull.imageset/Contents.json b/GetHip/Images-3.xcassets/JoingAParty/JoingAPartyFull.imageset/Contents.json
new file mode 100644
index 0000000..ca9a1c0
--- /dev/null
+++ b/GetHip/Images-3.xcassets/JoingAParty/JoingAPartyFull.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Joining Party.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/JoingAParty/JoingAPartyFull.imageset/Joining Party.png b/GetHip/Images-3.xcassets/JoingAParty/JoingAPartyFull.imageset/Joining Party.png
new file mode 100644
index 0000000..da2c88c
Binary files /dev/null and b/GetHip/Images-3.xcassets/JoingAParty/JoingAPartyFull.imageset/Joining Party.png differ
diff --git a/GetHip/Images-3.xcassets/LoadingPartyScene/Cancel.imageset/Cancel.png b/GetHip/Images-3.xcassets/LoadingPartyScene/Cancel.imageset/Cancel.png
new file mode 100644
index 0000000..780884b
Binary files /dev/null and b/GetHip/Images-3.xcassets/LoadingPartyScene/Cancel.imageset/Cancel.png differ
diff --git a/GetHip/Images-3.xcassets/LoadingPartyScene/Cancel.imageset/Cancel@2x.png b/GetHip/Images-3.xcassets/LoadingPartyScene/Cancel.imageset/Cancel@2x.png
new file mode 100644
index 0000000..ca41d53
Binary files /dev/null and b/GetHip/Images-3.xcassets/LoadingPartyScene/Cancel.imageset/Cancel@2x.png differ
diff --git a/GetHip/Images-3.xcassets/LoadingPartyScene/Cancel.imageset/Cancel@3x.png b/GetHip/Images-3.xcassets/LoadingPartyScene/Cancel.imageset/Cancel@3x.png
new file mode 100644
index 0000000..bdea3ea
Binary files /dev/null and b/GetHip/Images-3.xcassets/LoadingPartyScene/Cancel.imageset/Cancel@3x.png differ
diff --git a/GetHip/Images-3.xcassets/LoadingPartyScene/Cancel.imageset/Contents.json b/GetHip/Images-3.xcassets/LoadingPartyScene/Cancel.imageset/Contents.json
new file mode 100644
index 0000000..e5568da
--- /dev/null
+++ b/GetHip/Images-3.xcassets/LoadingPartyScene/Cancel.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "Cancel.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Cancel@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "Cancel@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/LoadingPartyScene/ChangeSong.imageset/Change Song.png b/GetHip/Images-3.xcassets/LoadingPartyScene/ChangeSong.imageset/Change Song.png
new file mode 100644
index 0000000..25eaf0a
Binary files /dev/null and b/GetHip/Images-3.xcassets/LoadingPartyScene/ChangeSong.imageset/Change Song.png differ
diff --git a/GetHip/Images-3.xcassets/LoadingPartyScene/ChangeSong.imageset/Change Song@2x.png b/GetHip/Images-3.xcassets/LoadingPartyScene/ChangeSong.imageset/Change Song@2x.png
new file mode 100644
index 0000000..549cd7f
Binary files /dev/null and b/GetHip/Images-3.xcassets/LoadingPartyScene/ChangeSong.imageset/Change Song@2x.png differ
diff --git a/GetHip/Images-3.xcassets/LoadingPartyScene/ChangeSong.imageset/Change Song@3x.png b/GetHip/Images-3.xcassets/LoadingPartyScene/ChangeSong.imageset/Change Song@3x.png
new file mode 100644
index 0000000..cee63fe
Binary files /dev/null and b/GetHip/Images-3.xcassets/LoadingPartyScene/ChangeSong.imageset/Change Song@3x.png differ
diff --git a/GetHip/Images-3.xcassets/LoadingPartyScene/ChangeSong.imageset/Contents.json b/GetHip/Images-3.xcassets/LoadingPartyScene/ChangeSong.imageset/Contents.json
new file mode 100644
index 0000000..b09b811
--- /dev/null
+++ b/GetHip/Images-3.xcassets/LoadingPartyScene/ChangeSong.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "Change Song.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Change Song@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "Change Song@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/Login/SignInFULL.imageset/Contents.json b/GetHip/Images-3.xcassets/Login/SignInFULL.imageset/Contents.json
new file mode 100644
index 0000000..50b7036
--- /dev/null
+++ b/GetHip/Images-3.xcassets/Login/SignInFULL.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Logo spacing.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/Login/SignInFULL.imageset/Logo spacing.png b/GetHip/Images-3.xcassets/Login/SignInFULL.imageset/Logo spacing.png
new file mode 100644
index 0000000..865b65b
Binary files /dev/null and b/GetHip/Images-3.xcassets/Login/SignInFULL.imageset/Logo spacing.png differ
diff --git a/GetHip/Images-3.xcassets/Login/SignInLogo.imageset/Contents.json b/GetHip/Images-3.xcassets/Login/SignInLogo.imageset/Contents.json
new file mode 100644
index 0000000..c2c08d2
--- /dev/null
+++ b/GetHip/Images-3.xcassets/Login/SignInLogo.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "Logo.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Logo@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "Logo@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/Login/SignInLogo.imageset/Logo.png b/GetHip/Images-3.xcassets/Login/SignInLogo.imageset/Logo.png
new file mode 100644
index 0000000..fd872fc
Binary files /dev/null and b/GetHip/Images-3.xcassets/Login/SignInLogo.imageset/Logo.png differ
diff --git a/GetHip/Images-3.xcassets/Login/SignInLogo.imageset/Logo@2x.png b/GetHip/Images-3.xcassets/Login/SignInLogo.imageset/Logo@2x.png
new file mode 100644
index 0000000..9b35e76
Binary files /dev/null and b/GetHip/Images-3.xcassets/Login/SignInLogo.imageset/Logo@2x.png differ
diff --git a/GetHip/Images-3.xcassets/Login/SignInLogo.imageset/Logo@3x.png b/GetHip/Images-3.xcassets/Login/SignInLogo.imageset/Logo@3x.png
new file mode 100644
index 0000000..6ff845b
Binary files /dev/null and b/GetHip/Images-3.xcassets/Login/SignInLogo.imageset/Logo@3x.png differ
diff --git a/GetHip/Images-3.xcassets/NoNewFriends/NoNewFriends.imageset/Contents.json b/GetHip/Images-3.xcassets/NoNewFriends/NoNewFriends.imageset/Contents.json
new file mode 100644
index 0000000..6636b96
--- /dev/null
+++ b/GetHip/Images-3.xcassets/NoNewFriends/NoNewFriends.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "No Friend Requests 6+.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "No Friend Requests 6+@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "No Friend Requests 6+@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/NoNewFriends/NoNewFriends.imageset/No Friend Requests 6+.png b/GetHip/Images-3.xcassets/NoNewFriends/NoNewFriends.imageset/No Friend Requests 6+.png
new file mode 100644
index 0000000..55e69fb
Binary files /dev/null and b/GetHip/Images-3.xcassets/NoNewFriends/NoNewFriends.imageset/No Friend Requests 6+.png differ
diff --git a/GetHip/Images-3.xcassets/NoNewFriends/NoNewFriends.imageset/No Friend Requests 6+@2x.png b/GetHip/Images-3.xcassets/NoNewFriends/NoNewFriends.imageset/No Friend Requests 6+@2x.png
new file mode 100644
index 0000000..4c3c487
Binary files /dev/null and b/GetHip/Images-3.xcassets/NoNewFriends/NoNewFriends.imageset/No Friend Requests 6+@2x.png differ
diff --git a/GetHip/Images-3.xcassets/NoNewFriends/NoNewFriends.imageset/No Friend Requests 6+@3x.png b/GetHip/Images-3.xcassets/NoNewFriends/NoNewFriends.imageset/No Friend Requests 6+@3x.png
new file mode 100644
index 0000000..58baca9
Binary files /dev/null and b/GetHip/Images-3.xcassets/NoNewFriends/NoNewFriends.imageset/No Friend Requests 6+@3x.png differ
diff --git a/GetHip/Images-3.xcassets/SendInvites/SendInvitesButton.imageset/Contents.json b/GetHip/Images-3.xcassets/SendInvites/SendInvitesButton.imageset/Contents.json
new file mode 100644
index 0000000..dc92a97
--- /dev/null
+++ b/GetHip/Images-3.xcassets/SendInvites/SendInvitesButton.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "Send Invites.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Send Invites@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "Send Invites@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/SendInvites/SendInvitesButton.imageset/Send Invites.png b/GetHip/Images-3.xcassets/SendInvites/SendInvitesButton.imageset/Send Invites.png
new file mode 100644
index 0000000..14631c9
Binary files /dev/null and b/GetHip/Images-3.xcassets/SendInvites/SendInvitesButton.imageset/Send Invites.png differ
diff --git a/GetHip/Images-3.xcassets/SendInvites/SendInvitesButton.imageset/Send Invites@2x.png b/GetHip/Images-3.xcassets/SendInvites/SendInvitesButton.imageset/Send Invites@2x.png
new file mode 100644
index 0000000..92804e5
Binary files /dev/null and b/GetHip/Images-3.xcassets/SendInvites/SendInvitesButton.imageset/Send Invites@2x.png differ
diff --git a/GetHip/Images-3.xcassets/SendInvites/SendInvitesButton.imageset/Send Invites@3x.png b/GetHip/Images-3.xcassets/SendInvites/SendInvitesButton.imageset/Send Invites@3x.png
new file mode 100644
index 0000000..c9ef07b
Binary files /dev/null and b/GetHip/Images-3.xcassets/SendInvites/SendInvitesButton.imageset/Send Invites@3x.png differ
diff --git a/GetHip/Images-3.xcassets/SendInvites/SendInvitesTapCircle.imageset/Contents.json b/GetHip/Images-3.xcassets/SendInvites/SendInvitesTapCircle.imageset/Contents.json
new file mode 100644
index 0000000..963851c
--- /dev/null
+++ b/GetHip/Images-3.xcassets/SendInvites/SendInvitesTapCircle.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "Tap Circle.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Tap Circle@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "Tap Circle@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GetHip/Images-3.xcassets/SendInvites/SendInvitesTapCircle.imageset/Tap Circle.png b/GetHip/Images-3.xcassets/SendInvites/SendInvitesTapCircle.imageset/Tap Circle.png
new file mode 100644
index 0000000..63200c2
Binary files /dev/null and b/GetHip/Images-3.xcassets/SendInvites/SendInvitesTapCircle.imageset/Tap Circle.png differ
diff --git a/GetHip/Images-3.xcassets/SendInvites/SendInvitesTapCircle.imageset/Tap Circle@2x.png b/GetHip/Images-3.xcassets/SendInvites/SendInvitesTapCircle.imageset/Tap Circle@2x.png
new file mode 100644
index 0000000..85c483c
Binary files /dev/null and b/GetHip/Images-3.xcassets/SendInvites/SendInvitesTapCircle.imageset/Tap Circle@2x.png differ
diff --git a/GetHip/Images-3.xcassets/SendInvites/SendInvitesTapCircle.imageset/Tap Circle@3x.png b/GetHip/Images-3.xcassets/SendInvites/SendInvitesTapCircle.imageset/Tap Circle@3x.png
new file mode 100644
index 0000000..646094e
Binary files /dev/null and b/GetHip/Images-3.xcassets/SendInvites/SendInvitesTapCircle.imageset/Tap Circle@3x.png differ
diff --git a/GetHip/Main.storyboard b/GetHip/Main.storyboard
index c2fb319..789fbb8 100644
--- a/GetHip/Main.storyboard
+++ b/GetHip/Main.storyboard
@@ -1276,13 +1276,13 @@
                                 </connections>
                             </button>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="n64-qL-raO">
-                                <rect key="frame" x="0.0" y="64" width="348" height="465"/>
+                                <rect key="frame" x="0.0" y="64" width="320" height="465"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" secondItem="n64-qL-raO" secondAttribute="height" multiplier="40:71" constant="85.633802816901408" id="4zb-FR-IKu"/>
+                                    <constraint firstAttribute="width" secondItem="n64-qL-raO" secondAttribute="height" multiplier="40:71" constant="58.028169014084483" id="4zb-FR-IKu"/>
                                 </constraints>
                                 <searchBar key="tableHeaderView" contentMode="redraw" id="fQ0-dw-Xa4">
-                                    <rect key="frame" x="0.0" y="0.0" width="348" height="44"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                     <textInputTraits key="textInputTraits"/>
                                     <connections>
diff --git a/GetHip/TestInviteFriendsController.swift b/GetHip/TestInviteFriendsController.swift
index 87205eb..0e52553 100644
--- a/GetHip/TestInviteFriendsController.swift
+++ b/GetHip/TestInviteFriendsController.swift
@@ -270,6 +270,13 @@ class TestInviteFriendsController: UIViewController, UITableViewDelegate, UITabl
 extension TestInviteFriendsController: PartyServiceManagerDelegate {
     
     func foundPeer() {
+        //case where friend is nearby and detected after party is started and none were found before
+        if(self.partyData.isInvitable.count == 0){
+            for i in 0..<self.frnds.count{
+                self.partyData.isInvitable.append(false)
+            }
+        }
+        
         for foundPeer in self.partyData.foundPeers {
             for friend in self.frnds {
                 if foundPeer.displayName == friend.displayName {