diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard
index 0d4c0fa2..f5f3572c 100644
--- a/Yep/Base.lproj/Main.storyboard
+++ b/Yep/Base.lproj/Main.storyboard
@@ -556,7 +556,7 @@
         <!--Skill Home View Controller-->
         <scene sceneID="kj4-Yg-Eog">
             <objects>
-                <viewController id="3gg-0l-MYn" customClass="SkillHomeViewController" customModule="Yep" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="SkillHomeViewController" id="3gg-0l-MYn" customClass="SkillHomeViewController" customModule="Yep" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="Vlu-dB-Ukl"/>
                         <viewControllerLayoutGuide type="bottom" id="IIx-oj-clN"/>
@@ -1580,6 +1580,7 @@
                         <segue destination="f92-fs-zdh" kind="show" identifier="showFeedMedia" id="fWY-6d-Rja"/>
                         <segue destination="AyC-pt-NR2" kind="show" identifier="showProfile" id="WEi-uo-nf5"/>
                         <segue destination="h8b-7V-qPb" kind="show" identifier="showFeedsWithSkill" id="D1j-0N-VMH"/>
+                        <segue destination="dYX-Ms-gWP" kind="show" identifier="showSkillHome" id="TTj-EA-7SS"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="ETW-Em-Kw5" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -1594,6 +1595,14 @@
             </objects>
             <point key="canvasLocation" x="1144.5" y="-1667"/>
         </scene>
+        <!--SkillHomeViewController-->
+        <scene sceneID="mll-N9-alH">
+            <objects>
+                <viewControllerPlaceholder storyboardName="Main" referencedIdentifier="SkillHomeViewController" id="dYX-Ms-gWP" sceneMemberID="viewController"/>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="tm8-6z-ZhG" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1150" y="-1840"/>
+        </scene>
         <!--FeedsViewController-->
         <scene sceneID="Rau-4Y-1qY">
             <objects>
@@ -2044,8 +2053,8 @@
         <image name="yep_icon_solo" width="120" height="120"/>
     </resources>
     <inferredMetricsTieBreakers>
+        <segue reference="Sdt-ox-uOm"/>
         <segue reference="WEi-uo-nf5"/>
         <segue reference="fWY-6d-Rja"/>
-        <segue reference="Sdt-ox-uOm"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/Yep/ViewControllers/Feeds/FeedsViewController.swift b/Yep/ViewControllers/Feeds/FeedsViewController.swift
index dd970d9a..c9d0d958 100644
--- a/Yep/ViewControllers/Feeds/FeedsViewController.swift
+++ b/Yep/ViewControllers/Feeds/FeedsViewController.swift
@@ -225,6 +225,18 @@ class FeedsViewController: UIViewController {
 
             vc.hidesBottomBarWhenPushed = true
 
+        case "showSkillHome":
+
+            let vc = segue.destinationViewController as! SkillHomeViewController
+
+            if let indexPath = sender as? NSIndexPath {
+                if let skill = feeds[indexPath.row].skill {
+                    vc.skill = SkillCell.Skill(ID: skill.id, localName: skill.localName, coverURLString: skill.coverURLString, category: nil)
+                }
+            }
+
+            vc.hidesBottomBarWhenPushed = true
+
         case "showFeedsWithSkill":
 
             let vc = segue.destinationViewController as! FeedsViewController
@@ -238,8 +250,8 @@ class FeedsViewController: UIViewController {
         case "showConversation":
 
             guard let
-                index = sender as? Int,
-                feedData = feeds[safe: index],
+                indexPath = sender as? NSIndexPath,
+                feedData = feeds[safe: indexPath.row],
                 realm = try? Realm() else {
                     return
             }
@@ -457,10 +469,10 @@ extension FeedsViewController: UITableViewDataSource, UITableViewDelegate {
         switch indexPath.section {
 
         case Section.SkillUsers.rawValue:
-            break
+            performSegueWithIdentifier("showSkillHome", sender: indexPath)
 
         case Section.Feed.rawValue:
-            performSegueWithIdentifier("showConversation", sender: indexPath.item)
+            performSegueWithIdentifier("showConversation", sender: indexPath)
 
         default:
             break