diff --git a/app/js/controllers.js b/app/js/controllers.js
index ec73c91..2b13f69 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -214,7 +214,7 @@ function RoomCtrl($scope, $routeParams, $timeout, socket) {
     case ('tshirt'):
       return tshirt;
     default:
-      return [];
+      return val.split(" ");
     }
   };
 
@@ -344,6 +344,7 @@ function RoomCtrl($scope, $routeParams, $timeout, socket) {
   };
 
   $scope.setCardPack = function (cardPack) {
+    $scope.showCustom = false;
     $scope.cardPack = cardPack;
     $scope.resetVote();
 
@@ -351,6 +352,10 @@ function RoomCtrl($scope, $routeParams, $timeout, socket) {
     socket.emit('set card pack', { roomUrl: $scope.roomId, cardPack: cardPack });
   };
 
+  $scope.setCustomPack = function () {
+    $scope.showCustom = true;
+  }
+
   $scope.vote = function (vote) {
     if ($scope.myVote !== vote) {
       if (!votingFinished() && $scope.voter) {
@@ -403,6 +408,7 @@ function RoomCtrl($scope, $routeParams, $timeout, socket) {
   $scope.humanCount = 0;
   $scope.voterCount = 0;
   $scope.showAdmin = false;
+  $scope.showCustom = false;
   $scope.voter = true;
   $scope.connections = {};
   $scope.votes = [];
diff --git a/app/partials/room.html b/app/partials/room.html
index 79e6149..3f2ff59 100644
--- a/app/partials/room.html
+++ b/app/partials/room.html
@@ -21,19 +21,29 @@
                 <li class="dropdown__item"><a href="#" ng-model="cardPack" id="deckSeq" ng-click="setCardPack('seq')">Sequential</a></li>
                 <li class="dropdown__item"><a href="#" ng-model="cardPack" id="deckPlay" ng-click="setCardPack('play')">Playing Cards</a></li>
                 <li class="dropdown__item"><a href="#" ng-model="cardPack" id="deckShirt" ng-click="setCardPack('tshirt')">T-Shirt</a></li>
+                <li class="dropdown__item"><a href="#" ng-model="cardPack" id="deckCustom" ng-click="setCustomPack()">Custom</a></li>
               </ul>
             </div>
         </div>
       </div>
+      </div>
     </div>
 
 
     <div class="cards{{cardsState}}">
-      <div ng-show="cards" ng-repeat="card in cards" ng-click="vote(card)" class="card" ng-class="{'card--selected' : card==myVote}" cardvalue>
-        {{card}}
-      </div>
-      <div ng-hide="cards" class="waiting">
-        No cards found
+      <div ng-switch on="showCustom">
+          <div ng-switch-when="true">
+              <input ng-model="customPack" ui-enter="setCardPack(customPack)" name="packfield" id="packfield" type="tel" maxlength="50" placeholder="space separated values" class="roomUrl" autofocus/>
+              <button ng-click="setCardPack(customPack)" class="span2 btn" >Set</button>
+          </div>
+          <div ng-switch-when="false">
+              <div ng-show="cards" ng-repeat="card in cards" ng-click="vote(card)" class="card" ng-class="{'card--selected' : card==myVote}" cardvalue>
+                {{card}}
+              </div>
+              <div ng-hide="cards" class="waiting">
+                No cards found
+              </div>
+          </div>
       </div>
     </div>
 
diff --git a/package.json b/package.json
index d8ccb9a..3523a73 100644
--- a/package.json
+++ b/package.json
@@ -23,4 +23,4 @@
   "devDependencies": {
     "socket.io-client": "*"
   }
-}
\ No newline at end of file
+}