diff --git a/index.html b/index.html
index 69e705a..272bf5f 100755
--- a/index.html
+++ b/index.html
@@ -382,6 +382,13 @@
               <i class="fa fa-fw fa-stop"></i>
             </button>
 
+            <button
+              ng-show="hasStatus(download, 'paused')"
+              class="btn"
+              ng-click="selectFiles(download)">
+              <i class="fa fa-fw fa-list"></i>
+            </button>
+
             <button
               class="btn hidden-phone"
               ng-show="['waiting', 'active'].indexOf( getType(download) )!= -1"
@@ -582,7 +589,7 @@
               <li class="label" title="Download Path"><i class="fa fa-fw fa-folder-open">&nbsp;</i> <span class="download-dir">{{download.dir}}</span></li>
             </ul>
             <ul class="download-files hidden-phone download-item">
-              <li class="label" ng-repeat="file in download.files">{{file.relpath}} ({{file.fmtLength}})</li>
+              <li class="label" ng-repeat="file in download.files" ng-class="{'label-success': file.selected}">{{file.relpath}} ({{file.fmtLength}})</li>
             </ul>
             <div ng-show="hasStatus(download, 'active')" class="download-item hidden-phone">
               <div class="download-graph" dspeed="download.downloadSpeed" uspeed="download.uploadSpeed" xticks="7" yticks="7"  dgraph draw="!download.collapsed"></div>
@@ -842,6 +849,37 @@ http://ex1.com/f2.mp4 http://ex2.com/f2.mp4
 </script>
 <!-- }}} -->
 
+<!-- {{{ select file modal -->
+<script type="text/ng-template" id="selectFiles.html">
+  <div class="modal-header">
+    <button class="close" ng-click="$dismiss()">x</button>
+    <h3>Choose files to start download for</h3>
+  </div>
+
+  <form class="form-horizontal modal-body">
+    <fieldset>
+      <div class="control-group">
+        <div ng-repeat="file in selectFiles.files">
+          <label class="control-label">Select to download </label>
+
+          <div class="controls">
+            <label class="checkbox">
+              <input type="checkbox" ng-model="file.selected"/>{{file.relpath}}
+            </label>
+          </div>
+          <br><br>
+        </div>
+      </div>
+    </fieldset>
+  </form>
+
+  <div class="modal-footer">
+    <button class="btn" ng-click="$dismiss()">Cancel</button>
+    <button class="btn btn-primary" ng-click="$close()">Choose</button>
+  </div>
+</script>
+<!-- }}} -->
+
 <!-- {{{ settings modal -->
 <script type="text/ng-template" id="settings.html">
   <div class="modal-header">
diff --git a/js/ctrls/main.js b/js/ctrls/main.js
index 0eeb180..5a94c12 100644
--- a/js/ctrls/main.js
+++ b/js/ctrls/main.js
@@ -1,537 +1,556 @@
 angular
 .module('webui.ctrls.download', [
-  "ui.bootstrap",
-  'webui.services.utils', 'webui.services.rpc', 'webui.services.rpc.helpers', 'webui.services.alerts',
-  'webui.services.settings', 'webui.services.modals', 'webui.services.configuration',
+	"ui.bootstrap",
+	'webui.services.utils', 'webui.services.rpc', 'webui.services.rpc.helpers', 'webui.services.alerts',
+	'webui.services.settings', 'webui.services.modals', 'webui.services.configuration',
 ])
 .controller('MainCtrl', [
-  '$scope', '$name', '$enable', '$rpc', '$rpchelpers', '$utils', '$alerts', '$modals',
-  '$fileSettings', '$activeInclude', '$waitingExclude', '$pageSize',
-  // for document title
-  '$window',
+	'$scope', '$name', '$enable', '$rpc', '$rpchelpers', '$utils', '$alerts', '$modals',
+	'$fileSettings', '$activeInclude', '$waitingExclude', '$pageSize',
+	// for document title
+	'$window',
 function(
-  scope, name, enable, rpc, rhelpers, utils, alerts, modals,
-  fsettings, activeInclude, waitingExclude, pageSize,
-  window
+	scope, name, enable, rpc, rhelpers, utils, alerts, modals,
+	fsettings, activeInclude, waitingExclude, pageSize,
+	window
 ) {
 
-  scope.name = name;   // default UI name
-  scope.enable = enable; // UI enable options
+	scope.name = name;	 // default UI name
+	scope.enable = enable; // UI enable options
 
-  var re_slashes = /\\/g;
-  var slash = "/";
-  var allStopped = [];
+	var re_slashes = /\\/g;
+	var slash = "/";
+	var allStopped = [];
 
-  scope.active = [], scope.waiting = [], scope.stopped = [];
-  scope.gstats = {};
-  scope.hideLinkedMetadata = true;
+	scope.active = [], scope.waiting = [], scope.stopped = [];
+	scope.gstats = {};
+	scope.hideLinkedMetadata = true;
 
-  // pause the download
-  // d: the download ctx
-  scope.pause = function(d) {
-    rpc.once('forcePause', [d.gid]);
-  }
+	// pause the download
+	// d: the download ctx
+	scope.pause = function(d) {
+		rpc.once('forcePause', [d.gid]);
+	}
 
-  // resume the download
-  // d: the download ctx
-  scope.resume = function(d) {
-    rpc.once('unpause', [d.gid]);
-  }
+	// resume the download
+	// d: the download ctx
+	scope.resume = function(d) {
+		rpc.once('unpause', [d.gid]);
+	}
 
-  scope.restart = function(d) {
-    // assumes downloads which are started by URIs, not torrents.
-    // the preferences are also not transferred, just simple restart
+	scope.restart = function(d) {
+		// assumes downloads which are started by URIs, not torrents.
+		// the preferences are also not transferred, just simple restart
 
-    rpc.once('getOption', [d.gid], function(data) {
-      var prefs = data[0];
-      rpc.once('getFiles', [d.gid], function(data) {
-        var files = data[0];
-        var uris =
-          _.chain(files).map(function(f) { return f.uris })
-          .filter(function(uris) { return uris && uris.length })
-          .map(function(uris) {
-            var u = _.chain(uris)
-              .map(function(u) { return u.uri })
-              .uniq().value();
-            return u;
-          }).value();
+		rpc.once('getOption', [d.gid], function(data) {
+			var prefs = data[0];
+			rpc.once('getFiles', [d.gid], function(data) {
+				var files = data[0];
+				var uris =
+					_.chain(files).map(function(f) { return f.uris })
+					.filter(function(uris) { return uris && uris.length })
+					.map(function(uris) {
+						var u = _.chain(uris)
+							.map(function(u) { return u.uri })
+							.uniq().value();
+						return u;
+					}).value();
 
-        if (uris.length > 0) {
-          console.log('adding uris:', uris, prefs);
-          scope.remove(d, function() {
-            rhelpers.addUris(uris, prefs);
-          }, true);
-        }
-      });
-    });
-  }
+				if (uris.length > 0) {
+					console.log('adding uris:', uris, prefs);
+					scope.remove(d, function() {
+						rhelpers.addUris(uris, prefs);
+					}, true);
+				}
+			});
+		});
+	}
 
 
 
-  scope.canRestart = function(d) {
-    return (['active', 'paused'].indexOf(d.status) == -1
-      && !d.bittorrent);
-  }
+	scope.canRestart = function(d) {
+		return (['active', 'paused'].indexOf(d.status) == -1
+			&& !d.bittorrent);
+	}
 
-  // remove the download,
-  // put it in stopped list if active,
-  // otherwise permanantly remove it
-  // d: the download ctx
-  scope.remove = function(d, cb, noConfirm) {
-    // HACK to make sure an angular digest is not running, as only one can happen at a time, and confirm is a blocking
-    // call so an rpc response can also trigger a digest call
-    setTimeout(function() {
-      if (!noConfirm && !confirm("Remove %s and associated meta-data?".replace("%s", d.name))) {
-        return;
-      }
+	// remove the download,
+	// put it in stopped list if active,
+	// otherwise permanantly remove it
+	// d: the download ctx
+	scope.remove = function(d, cb, noConfirm) {
+		// HACK to make sure an angular digest is not running, as only one can happen at a time, and confirm is a blocking
+		// call so an rpc response can also trigger a digest call
+		setTimeout(function() {
+			if (!noConfirm && !confirm("Remove %s and associated meta-data?".replace("%s", d.name))) {
+				return;
+			}
 
-      var method = 'remove';
+			var method = 'remove';
 
-      if (scope.getType(d) == 'stopped')
-        method = 'removeDownloadResult';
+			if (scope.getType(d) == 'stopped')
+				method = 'removeDownloadResult';
 
-      if (d.followedFrom) {
-        scope.remove(d.followedFrom, function() {}, true);
-        d.followedFrom = null;
-      }
-      rpc.once(method, [d.gid], cb);
-    }, 0);
-  }
+			if (d.followedFrom) {
+				scope.remove(d.followedFrom, function() {}, true);
+				d.followedFrom = null;
+			}
+			rpc.once(method, [d.gid], cb);
+		}, 0);
+	}
 
-  // start filling in the model of active,
-  // waiting and stopped download
-  rpc.subscribe('tellActive', [], function(data) {
-    scope.$apply(function() {
-      utils.mergeMap(data[0], scope.active, scope.getCtx);
-    });
-  });
+	// start filling in the model of active,
+	// waiting and stopped download
+	rpc.subscribe('tellActive', [], function(data) {
+		scope.$apply(function() {
+			utils.mergeMap(data[0], scope.active, scope.getCtx);
+		});
+	});
 
-  rpc.subscribe('tellWaiting', [0, 1000], function(data) {
-    scope.$apply(function() {
-      utils.mergeMap(data[0], scope.waiting, scope.getCtx);
-    });
-  });
+	rpc.subscribe('tellWaiting', [0, 1000], function(data) {
+		scope.$apply(function() {
+			utils.mergeMap(data[0], scope.waiting, scope.getCtx);
+		});
+	});
 
 
-  rpc.subscribe('tellStopped', [0, 1000], function(data) {
-    scope.$apply(function() {
-      if (!scope.hideLinkedMetadata) {
-        utils.mergeMap(data[0], scope.stopped, scope.getCtx);
-        return;
-      }
-      utils.mergeMap(data[0], allStopped, scope.getCtx);
-      var gids = {};
-      _.forEach(allStopped, function(e) {
-        gids[e.gid] = e;
-      });
-      _.forEach(scope.active, function(e) {
-        gids[e.gid] = e;
-      });
-      _.forEach(scope.waiting, function(e) {
-        gids[e.gid] = e;
-      });
-      scope.stopped = _.filter(allStopped, function(e) {
-        if (!e.metadata || !e.followedBy || !(e.followedBy in gids)) {
-          return true;
-        }
-        var linked = gids[e.followedBy];
-        linked.followedFrom = e;
-        return false;
-      });
-    });
-  });
+	rpc.subscribe('tellStopped', [0, 1000], function(data) {
+		scope.$apply(function() {
+			if (!scope.hideLinkedMetadata) {
+				utils.mergeMap(data[0], scope.stopped, scope.getCtx);
+				return;
+			}
+			utils.mergeMap(data[0], allStopped, scope.getCtx);
+			var gids = {};
+			_.forEach(allStopped, function(e) {
+				gids[e.gid] = e;
+			});
+			_.forEach(scope.active, function(e) {
+				gids[e.gid] = e;
+			});
+			_.forEach(scope.waiting, function(e) {
+				gids[e.gid] = e;
+			});
+			scope.stopped = _.filter(allStopped, function(e) {
+				if (!e.metadata || !e.followedBy || !(e.followedBy in gids)) {
+					return true;
+				}
+				var linked = gids[e.followedBy];
+				linked.followedFrom = e;
+				return false;
+			});
+		});
+	});
 
-  rpc.subscribe('getGlobalStat', [], function(data) {
-    scope.$apply(function() {
-      scope.gstats = data[0];
-      window.document.title = utils.getTitle(scope.gstats);
-    });
-  });
+	rpc.subscribe('getGlobalStat', [], function(data) {
+		scope.$apply(function() {
+			scope.gstats = data[0];
+			window.document.title = utils.getTitle(scope.gstats);
+		});
+	});
 
-  rpc.once('getVersion', [], function(data) {
-    scope.$apply(function() {
-      scope.miscellaneous = data[0];
-    });
-  });
+	rpc.once('getVersion', [], function(data) {
+		scope.$apply(function() {
+			scope.miscellaneous = data[0];
+		});
+	});
 
-  // total number of downloads, updates dynamically as downloads are
-  // stored in scope
-  scope.totalDownloads = 0;
+	// total number of downloads, updates dynamically as downloads are
+	// stored in scope
+	scope.totalDownloads = 0;
 
-  // download search filter
-  scope.downloadFilter = "";
-  scope.downloadFilterCommitted = "";
+	// download search filter
+	scope.downloadFilter = "";
+	scope.downloadFilterCommitted = "";
 
-  scope.onDownloadFilter = function() {
-    if (scope.downloadFilterTimer) {
-      clearTimeout(scope.downloadFilterTimer);
-    }
-    scope.downloadFilterTimer = setTimeout(function() {
-      delete scope.downloadFilterTimer;
-      if (scope.downloadFilterCommitted !== scope.downloadFilter) {
-        scope.downloadFilterCommitted = scope.downloadFilter;
-        scope.$digest();
-      }
-    }, 500);
-  };
+	scope.onDownloadFilter = function() {
+		if (scope.downloadFilterTimer) {
+			clearTimeout(scope.downloadFilterTimer);
+		}
+		scope.downloadFilterTimer = setTimeout(function() {
+			delete scope.downloadFilterTimer;
+			if (scope.downloadFilterCommitted !== scope.downloadFilter) {
+				scope.downloadFilterCommitted = scope.downloadFilter;
+				scope.$digest();
+			}
+		}, 500);
+	};
 
-  scope.filterDownloads = function(downloads) {
-    if (!scope.downloadFilterCommitted) {
-      return downloads;
-    }
-    var filter = scope.downloadFilterCommitted.
-      replace(/[{}()\[\]\\^$.?]/g, "\\$&").
-      replace(/\*/g, ".*").
-      replace(/\./g, ".");
-    filter = new RegExp(filter, "i");
-    return _.filter(downloads, function(d) {
-      if (filter.test(d.name)) return true;
-      return _.filter(d.files, function(f) {
-        return filter.test(f.relpath);
-      }).length;
-    });
-  };
+	scope.filterDownloads = function(downloads) {
+		if (!scope.downloadFilterCommitted) {
+			return downloads;
+		}
+		var filter = scope.downloadFilterCommitted.
+			replace(/[{}()\[\]\\^$.?]/g, "\\$&").
+			replace(/\*/g, ".*").
+			replace(/\./g, ".");
+		filter = new RegExp(filter, "i");
+		return _.filter(downloads, function(d) {
+			if (filter.test(d.name)) return true;
+			return _.filter(d.files, function(f) {
+				return filter.test(f.relpath);
+			}).length;
+		});
+	};
 
-  scope.clearFilter = function() {
-    scope.downloadFilter = scope.downloadFilterCommitted = "";
-  };
+	scope.clearFilter = function() {
+		scope.downloadFilter = scope.downloadFilterCommitted = "";
+	};
 
-  scope.toggleStateFilters = function() {
-    scope.filterSpeed = !scope.filterSpeed;
-    scope.filterActive = !scope.filterActive;
-    scope.filterWaiting = !scope.filterWaiting;
-    scope.filterComplete = !scope.filterComplete;
-    scope.filterError = !scope.filterError;
-    scope.filterPaused = !scope.filterPaused;
-    scope.filterRemoved = !scope.filterRemoved;
-    scope.persistFilters();
-  };
+	scope.toggleStateFilters = function() {
+		scope.filterSpeed = !scope.filterSpeed;
+		scope.filterActive = !scope.filterActive;
+		scope.filterWaiting = !scope.filterWaiting;
+		scope.filterComplete = !scope.filterComplete;
+		scope.filterError = !scope.filterError;
+		scope.filterPaused = !scope.filterPaused;
+		scope.filterRemoved = !scope.filterRemoved;
+		scope.persistFilters();
+	};
 
-  scope.resetFilters = function() {
-    scope.filterSpeed =
-      scope.filterActive =
-      scope.filterWaiting =
-      scope.filterComplete =
-      scope.filterError =
-      scope.filterPaused =
-      scope.filterRemoved =
-      true;
-    scope.clearFilter();
-    scope.persistFilters();
-  };
+	scope.resetFilters = function() {
+		scope.filterSpeed =
+			scope.filterActive =
+			scope.filterWaiting =
+			scope.filterComplete =
+			scope.filterError =
+			scope.filterPaused =
+			scope.filterRemoved =
+			true;
+		scope.clearFilter();
+		scope.persistFilters();
+	};
 
-  scope.persistFilters = function() {
-    var o = JSON.stringify({
-      s: scope.filterSpeed,
-      a: scope.filterActive,
-      w: scope.filterWaiting,
-      c: scope.filterComplete,
-      e: scope.filterError,
-      p: scope.filterPaused,
-      r: scope.filterRemoved
-    });
-    utils.setCookie("aria2filters", o);
-  };
+	scope.persistFilters = function() {
+		var o = JSON.stringify({
+			s: scope.filterSpeed,
+			a: scope.filterActive,
+			w: scope.filterWaiting,
+			c: scope.filterComplete,
+			e: scope.filterError,
+			p: scope.filterPaused,
+			r: scope.filterRemoved
+		});
+		utils.setCookie("aria2filters", o);
+	};
 
-  scope.loadFilters = function() {
-    var o = JSON.parse(utils.getCookie("aria2filters"));
-    if (!o) {
-      scope.resetFilters();
-      return;
-    }
-    scope.filterSpeed = !!o.s;
-    scope.filterActive = !!o.a;
-    scope.filterWaiting = !!o.w;
-    scope.filterComplete = !!o.c;
-    scope.filterError = !!o.e;
-    scope.filterPaused = !!o.p;
-    scope.filterRemoved = !!o.r;
-  };
+	scope.loadFilters = function() {
+		var o = JSON.parse(utils.getCookie("aria2filters"));
+		if (!o) {
+			scope.resetFilters();
+			return;
+		}
+		scope.filterSpeed = !!o.s;
+		scope.filterActive = !!o.a;
+		scope.filterWaiting = !!o.w;
+		scope.filterComplete = !!o.c;
+		scope.filterError = !!o.e;
+		scope.filterPaused = !!o.p;
+		scope.filterRemoved = !!o.r;
+	};
 
-  scope.loadFilters();
+	scope.loadFilters();
 
-  scope.toggleCollapsed = function(download) {
-    if (!download.collapsed) {
-      download.animCollapsed = true;
-      // ng-unswitch after half a second.
-      // XXX hacky way, because I'm to lazy right now to wire up proper
-      // transitionend events.
-      setTimeout(function() {
-        scope.$apply(function() {
-          download.collapsed = true;
-        });
-      }, 500);
-      return;
-    }
+	scope.toggleCollapsed = function(download) {
+		if (!download.collapsed) {
+			download.animCollapsed = true;
+			// ng-unswitch after half a second.
+			// XXX hacky way, because I'm to lazy right now to wire up proper
+			// transitionend events.
+			setTimeout(function() {
+				scope.$apply(function() {
+					download.collapsed = true;
+				});
+			}, 500);
+			return;
+		}
 
-    download.collapsed = false;
-    setTimeout(function() {
-      scope.$apply(function() {
-        download.animCollapsed = false;
-      });
-    }, 0);
-  };
+		download.collapsed = false;
+		setTimeout(function() {
+			scope.$apply(function() {
+				download.animCollapsed = false;
+			});
+		}, 0);
+	};
 
 
-  // max downloads shown in one page
-  scope.pageSize = pageSize;
+	// max downloads shown in one page
+	scope.pageSize = pageSize;
 
-  // current displayed page
-  scope.currentPage = 1;
+	// current displayed page
+	scope.currentPage = 1;
 
-  // total amount of downloads returned by aria2
-  scope.totalAria2Downloads = function() {
-    return scope.active.length
-      + scope.waiting.length
-      + scope.stopped.length;
-  }
+	// total amount of downloads returned by aria2
+	scope.totalAria2Downloads = function() {
+		return scope.active.length
+			+ scope.waiting.length
+			+ scope.stopped.length;
+	}
 
-  // actual downloads used by the view
-  scope.getDownloads = function() {
-    var downloads = [];
-    if (scope.filterActive) {
-      if (!scope.filterSpeed) {
-        downloads = _.filter(scope.active, function (e) {
-          return !+e.uploadSpeed && !+e.downloadSpeed;
-        });
-      }
-      else {
-        downloads = scope.active;
-      }
-    }
-    else if (scope.filterSpeed) {
-      downloads = _.filter(scope.active, function (e) {
-        return +e.uploadSpeed || +e.downloadSpeed;
-      });
-    }
-    if (scope.filterWaiting) {
-      downloads = downloads.concat(_.filter(scope.waiting, function (e) {
-        return e.status == "waiting";
-      }));
-    }
-    if (scope.filterPaused) {
-      downloads = downloads.concat(_.filter(scope.waiting, function (e) {
-        return e.status == "paused";
-      }));
-    }
-    if (scope.filterError) {
-      downloads = downloads.concat(_.filter(scope.stopped, function (e) {
-        return e.status == "error";
-      }));
-    }
-    if (scope.filterComplete) {
-      downloads = downloads.concat(_.filter(scope.stopped, function (e) {
-        return e.status == "complete";
-      }));
-    }
-    if (scope.filterRemoved) {
-      downloads = downloads.concat(_.filter(scope.stopped, function (e) {
-        return e.status == "removed";
-      }));
-    }
+	// actual downloads used by the view
+	scope.getDownloads = function() {
+		var downloads = [];
+		if (scope.filterActive) {
+			if (!scope.filterSpeed) {
+				downloads = _.filter(scope.active, function (e) {
+					return !+e.uploadSpeed && !+e.downloadSpeed;
+				});
+			}
+			else {
+				downloads = scope.active;
+			}
+		}
+		else if (scope.filterSpeed) {
+			downloads = _.filter(scope.active, function (e) {
+				return +e.uploadSpeed || +e.downloadSpeed;
+			});
+		}
+		if (scope.filterWaiting) {
+			downloads = downloads.concat(_.filter(scope.waiting, function (e) {
+				return e.status == "waiting";
+			}));
+		}
+		if (scope.filterPaused) {
+			downloads = downloads.concat(_.filter(scope.waiting, function (e) {
+				return e.status == "paused";
+			}));
+		}
+		if (scope.filterError) {
+			downloads = downloads.concat(_.filter(scope.stopped, function (e) {
+				return e.status == "error";
+			}));
+		}
+		if (scope.filterComplete) {
+			downloads = downloads.concat(_.filter(scope.stopped, function (e) {
+				return e.status == "complete";
+			}));
+		}
+		if (scope.filterRemoved) {
+			downloads = downloads.concat(_.filter(scope.stopped, function (e) {
+				return e.status == "removed";
+			}));
+		}
 
-    downloads = scope.filterDownloads(downloads);
+		downloads = scope.filterDownloads(downloads);
 
-    scope.totalDownloads = downloads.length;
+		scope.totalDownloads = downloads.length;
 
-    downloads = downloads.slice( (scope.currentPage - 1) * scope.pageSize );
-    downloads.splice( scope.pageSize );
+		downloads = downloads.slice( (scope.currentPage - 1) * scope.pageSize );
+		downloads.splice( scope.pageSize );
 
-    return downloads;
-  }
+		return downloads;
+	}
 
-  // convert the donwload form aria2 to once used by the view,
-  // minor additions of some fields and checks
-  scope.getCtx = function(d, ctx) {
-    if (!ctx) {
-      ctx = {
-        dir: d.dir,
-        status: d.status,
-        gid: d.gid,
-        followedBy: (d.followedBy && d.followedBy.length == 1
-          ? d.followedBy[0] : null),
-        followedFrom: null,
-        numPieces: d.numPieces,
-        connections: d.connections,
-        bitfield: d.bitfield,
-        totalLength: d.totalLength,
-        fmtTotalLength: utils.fmtsize(d.totalLength),
-        completedLength: d.completedLength,
-        fmtCompletedLength: utils.fmtsize(d.completedLength),
-        uploadLength: d.uploadLength,
-        fmtUploadLength: utils.fmtsize(d.uploadLength),
-        pieceLength: d.pieceLength,
-        fmtPieceLength: utils.fmtsize(d.pieceLength),
-        downloadSpeed: d.downloadSpeed,
-        fmtDownloadSpeed: utils.fmtspeed(d.downloadSpeed),
-        uploadSpeed: d.uploadSpeed,
-        fmtUploadSpeed: utils.fmtspeed(d.uploadSpeed),
-        collapsed: true,
-        animCollapsed: true,
-        files: [],
-      };
-    }
-    else {
-      ctx.dir = d.dir;
-      ctx.status = d.status;
-      ctx.gid = d.gid;
-      ctx.followedBy = (d.followedBy && d.followedBy.length == 1
-        ? d.followedBy[0] : null);
-      ctx.followedFrom = null;
-      ctx.numPieces = d.numPieces;
-      ctx.connections = d.connections;
-      ctx.bitfield = d.bitfield;
-      if (ctx.totalLength !== d.totalLength) {
-        ctx.totalLength = d.totalLength;
-        ctx.fmtTotalLength = utils.fmtsize(d.totalLength);
-      }
-      if (ctx.completedLength !== d.completedLength) {
-        ctx.completedLength = d.completedLength;
-        ctx.fmtCompletedLength = utils.fmtsize(d.completedLength);
-      }
-      if (ctx.uploadLength !== d.uploadength) {
-        ctx.uploadLength = d.uploadlength;
-        ctx.fmtUploadLength = utils.fmtsize(d.uploadLength);
-      }
-      if (ctx.pieceLength !== d.pieceLength) {
-        ctx.pieceLength = d.pieceLength;
-        ctx.fmtPieceLength = utils.fmtsize(d.pieceLength);
-      }
-      if (ctx.downloadSpeed !== d.downloadSpeed) {
-        ctx.downloadSpeed =  d.downloadSpeed;
-        ctx.fmtDownloadSpeed = utils.fmtspeed(d.downloadSpeed);
-      }
-      if (ctx.uploadSpeed !== d.uploadSpeed) {
-        ctx.uploadSpeed =  d.uploadSpeed;
-        ctx.fmtUploadSpeed = utils.fmtspeed(d.uploadSpeed);
-      }
-    }
+	// convert the donwload form aria2 to once used by the view,
+	// minor additions of some fields and checks
+	scope.getCtx = function(d, ctx) {
+		if (!ctx) {
+			ctx = {
+				dir: d.dir,
+				status: d.status,
+				gid: d.gid,
+				followedBy: (d.followedBy && d.followedBy.length == 1
+					? d.followedBy[0] : null),
+				followedFrom: null,
+				numPieces: d.numPieces,
+				connections: d.connections,
+				bitfield: d.bitfield,
+				totalLength: d.totalLength,
+				fmtTotalLength: utils.fmtsize(d.totalLength),
+				completedLength: d.completedLength,
+				fmtCompletedLength: utils.fmtsize(d.completedLength),
+				uploadLength: d.uploadLength,
+				fmtUploadLength: utils.fmtsize(d.uploadLength),
+				pieceLength: d.pieceLength,
+				fmtPieceLength: utils.fmtsize(d.pieceLength),
+				downloadSpeed: d.downloadSpeed,
+				fmtDownloadSpeed: utils.fmtspeed(d.downloadSpeed),
+				uploadSpeed: d.uploadSpeed,
+				fmtUploadSpeed: utils.fmtspeed(d.uploadSpeed),
+				collapsed: true,
+				animCollapsed: true,
+				files: [],
+			};
+		}
+		else {
+			ctx.dir = d.dir;
+			ctx.status = d.status;
+			ctx.gid = d.gid;
+			ctx.followedBy = (d.followedBy && d.followedBy.length == 1
+				? d.followedBy[0] : null);
+			ctx.followedFrom = null;
+			ctx.numPieces = d.numPieces;
+			ctx.connections = d.connections;
+			ctx.bitfield = d.bitfield;
+			if (ctx.totalLength !== d.totalLength) {
+				ctx.totalLength = d.totalLength;
+				ctx.fmtTotalLength = utils.fmtsize(d.totalLength);
+			}
+			if (ctx.completedLength !== d.completedLength) {
+				ctx.completedLength = d.completedLength;
+				ctx.fmtCompletedLength = utils.fmtsize(d.completedLength);
+			}
+			if (ctx.uploadLength !== d.uploadength) {
+				ctx.uploadLength = d.uploadlength;
+				ctx.fmtUploadLength = utils.fmtsize(d.uploadLength);
+			}
+			if (ctx.pieceLength !== d.pieceLength) {
+				ctx.pieceLength = d.pieceLength;
+				ctx.fmtPieceLength = utils.fmtsize(d.pieceLength);
+			}
+			if (ctx.downloadSpeed !== d.downloadSpeed) {
+				ctx.downloadSpeed =	d.downloadSpeed;
+				ctx.fmtDownloadSpeed = utils.fmtspeed(d.downloadSpeed);
+			}
+			if (ctx.uploadSpeed !== d.uploadSpeed) {
+				ctx.uploadSpeed =	d.uploadSpeed;
+				ctx.fmtUploadSpeed = utils.fmtspeed(d.uploadSpeed);
+			}
+		}
 
-    var dlName;
-    var files = d.files;
-    if (files) {
-      var cfiles = ctx.files;
-      for (var i = 0; i < files.length; ++i) {
-        var cfile = cfiles[i] || (cfiles[i] = {});
-        var file = files[i];
-        if (file.path !== cfile.path) {
-          cfile.path = file.path;
-          cfile.length = file.length;
-          cfile.fmtLength = utils.fmtsize(file.length);
-          cfile.relpath = file.path.replace(re_slashes, slash);
-          if (!cfile.relpath) {
-            cfile.relpath = (file.uris && file.uris[0] && file.uris[0].uri) || "Unknown";
-          }
-          else if (!cfile.relpath.startsWith("[")) { // METADATA
-            cfile.relpath = cfile.relpath.substr(ctx.dir.length + 1);
-          }
-        }
-      }
-      cfiles.length = files.length;
-      if (cfiles.length) {
-        dlName = cfiles[0].relpath;
-      }
-    }
-    else {
-      delete ctx.files;
-    }
+		var dlName;
+		var files = d.files;
+		if (files) {
+			var cfiles = ctx.files;
+			for (var i = 0; i < files.length; ++i) {
+				var cfile = cfiles[i] || (cfiles[i] = {});
+				var file = files[i];
+				if (file.path !== cfile.path) {
+					cfile.index = +file.index;
+					cfile.path = file.path;
+					cfile.length = file.length;
+					cfile.fmtLength = utils.fmtsize(file.length);
+					cfile.relpath = file.path.replace(re_slashes, slash);
+					if (!cfile.relpath) {
+						cfile.relpath = (file.uris && file.uris[0] && file.uris[0].uri) || "Unknown";
+					}
+					else if (!cfile.relpath.startsWith("[")) { // METADATA
+						cfile.relpath = cfile.relpath.substr(ctx.dir.length + 1);
+					}
+				}
+				cfile.selected = (file.selected === "true");
+			}
+			cfiles.length = files.length;
+			if (cfiles.length) {
+				dlName = cfiles[0].relpath;
+			}
+		}
+		else {
+			delete ctx.files;
+		}
 
-    var btName;
-    if (d.bittorrent) {
-      btName = d.bittorrent.info && d.bittorrent.info.name;
-      ctx.bittorrent = true;
-    }
-    else {
-      delete ctx.bittorrent;
-    }
+		var btName;
+		if (d.bittorrent) {
+			btName = d.bittorrent.info && d.bittorrent.info.name;
+			ctx.bittorrent = true;
+		}
+		else {
+			delete ctx.bittorrent;
+		}
 
-    ctx.name = btName || dlName || "Unknown";
-    ctx.metadata = ctx.name.startsWith("[METADATA]");
-    if (ctx.metadata) {
-      ctx.name = ctx.name.substr(10);
-    }
+		ctx.name = btName || dlName || "Unknown";
+		ctx.metadata = ctx.name.startsWith("[METADATA]");
+		if (ctx.metadata) {
+			ctx.name = ctx.name.substr(10);
+		}
 
-    return ctx;
-  };
+		return ctx;
+	};
 
-  scope.hasStatus = function hasStatus(d, status) {
-    if (_.isArray(status)) {
-      if (status.length == 0) return false;
-      return hasStatus(d, status[0]) || hasStatus(d, status.slice(1));
-    }
-    else {
-      return d.status == status;
-    }
-  };
+	scope.hasStatus = function hasStatus(d, status) {
+		if (_.isArray(status)) {
+			if (status.length == 0) return false;
+			return hasStatus(d, status[0]) || hasStatus(d, status.slice(1));
+		}
+		else {
+			return d.status == status;
+		}
+	};
 
-  // get time left for the download with
-  // current download speed,
-  // could be smarter by different heuristics
-  scope.getEta = function(d) {
-    return (d.totalLength-d.completedLength) / d.downloadSpeed;
-  }
+	// get time left for the download with
+	// current download speed,
+	// could be smarter by different heuristics
+	scope.getEta = function(d) {
+		return (d.totalLength-d.completedLength) / d.downloadSpeed;
+	}
 
-  scope.getProgressClass = function(d) {
-    switch (d.status) {
-      case "paused":
-        return "progress-info";
-      case "error":
-        return "progress-danger";
-      case "removed":
-        return "progress-warning";
-      case "active":
-        return "progress-active";
-      case "complete":
-        return "progress-success";
-      default:
-        return "";
-    }
-  };
+	scope.getProgressClass = function(d) {
+		switch (d.status) {
+			case "paused":
+				return "progress-info";
+			case "error":
+				return "progress-danger";
+			case "removed":
+				return "progress-warning";
+			case "active":
+				return "progress-active";
+			case "complete":
+				return "progress-success";
+			default:
+				return "";
+		}
+	};
 
-  // gets the progress in percentages
-  scope.getProgress = function(d) {
-    var percentage = (d.completedLength / d.totalLength)*100 || 0;
-    percentage = percentage.toFixed(2);
-    if(!percentage) percentage = 0;
+	// gets the progress in percentages
+	scope.getProgress = function(d) {
+		var percentage = (d.completedLength / d.totalLength)*100 || 0;
+		percentage = percentage.toFixed(2);
+		if(!percentage) percentage = 0;
 
-    return percentage;
-  };
+		return percentage;
+	};
 
-  // gets the type for the download as classified by the aria2 rpc calls
-  scope.getType = function(d) {
-    var type = d.status;
-    if (type == "paused") type = "waiting";
-    if (["error", "removed", "complete"].indexOf(type) != -1)
-      type = "stopped";
-    return type;
-  };
+	// gets the type for the download as classified by the aria2 rpc calls
+	scope.getType = function(d) {
+		var type = d.status;
+		if (type == "paused") type = "waiting";
+		if (["error", "removed", "complete"].indexOf(type) != -1)
+			type = "stopped";
+		return type;
+	};
 
-  scope.showSettings = function(d) {
-    var type = scope.getType(d)
-      , settings = {};
+	scope.selectFiles = function(d) {
+		console.log('got back files for the torrent ...');
+		modals.invoke('selectFiles', d.files, function(files) {
+			var indexes = "";
+			_.forEach(files, function(f) {
+				if (f.selected) {
+					indexes += "," + f.index;
+				}
+			});
 
-    rpc.once('getOption', [d.gid], function(data) {
-      var vals = data[0];
+			indexes = indexes.slice(1);
+			rpc.once('changeOption', [d.gid, {'select-file': indexes}], function(res) {
+				console.log('changed indexes to:', indexes, res);
+			})
+		});
+	}
 
-      var sets = _.cloneDeep(fsettings);
-      for (var i in sets) {
-        if (type == 'active' && activeInclude.indexOf(i) == -1) continue;
+	scope.showSettings = function(d) {
+		var type = scope.getType(d)
+			, settings = {};
 
-        if (type == 'waiting' && waitingExclude.indexOf(i) != -1) continue;
+		rpc.once('getOption', [d.gid], function(data) {
+			var vals = data[0];
 
-        settings[i] = sets[i];
-        settings[i].val = vals[i] || settings[i].val;
-      }
+			var sets = _.cloneDeep(fsettings);
+			for (var i in sets) {
+				if (type == 'active' && activeInclude.indexOf(i) == -1) continue;
 
-      modals.invoke('settings', settings, d.name + ' settings', 'Change', function(settings) {
-        var sets = {};
-        for (var i in settings) { sets[i] = settings[i].val };
+				if (type == 'waiting' && waitingExclude.indexOf(i) != -1) continue;
 
-        rpc.once('changeOption', [d.gid, sets]);
-      });
-    });
+				settings[i] = sets[i];
+				settings[i].val = vals[i] || settings[i].val;
+			}
 
-    return false;
-  }
+			modals.invoke('settings', settings, d.name + ' settings', 'Change', function(settings) {
+				var sets = {};
+				for (var i in settings) { sets[i] = settings[i].val };
+
+				rpc.once('changeOption', [d.gid, sets]);
+			});
+		});
+
+		return false;
+	}
 
 }]);
diff --git a/js/ctrls/modal.js b/js/ctrls/modal.js
index fbbf0ef..4bf238f 100644
--- a/js/ctrls/modal.js
+++ b/js/ctrls/modal.js
@@ -107,6 +107,30 @@ angular
     }
   };
 
+  scope.selectFiles = {
+    open: function(files, cb) {
+      var self = this;
+
+	  this.files = _.cloneDeep(files);
+      this.inst = $modal.open({
+        templateUrl: "selectFiles.html",
+        scope: scope,
+        windowClass: "modal-large"
+      });
+
+      this.inst.result.then(function() {
+        delete self.inst;
+
+        if (cb) {
+          cb(self.files);
+        }
+      },
+      function() {
+        delete self.inst;
+      });
+    }
+  };
+
   scope.connection = {
     open: function(defaults, cb) {
       var self = this;
@@ -118,6 +142,7 @@ angular
         scope: scope,
         windowClass: "modal-large",
       });
+
       this.inst.result.then(function() {
         delete self.inst;
         if (cb) {
@@ -150,6 +175,7 @@ angular
           scope: scope,
           windowClass: "modal-large",
         });
+
         this.inst.result.then(function() {
           delete self.inst;
           if (cb) {
@@ -198,10 +224,10 @@ angular
 
   rpc.once('getVersion', [], function(data) {
       scope.miscellaneous = data[0];
-      });
+  });
 
   _.each([
-    'getUris', 'getTorrents', 'getMetalinks',
+    'getUris', 'getTorrents', 'getMetalinks', 'selectFiles',
     'settings', 'connection', 'server_info', 'about'
   ], function(name) {
     modals.register(name, function() {
diff --git a/js/ctrls/nav.js b/js/ctrls/nav.js
index c71ec57..99f1581 100644
--- a/js/ctrls/nav.js
+++ b/js/ctrls/nav.js
@@ -1,142 +1,136 @@
 angular
 .module('webui.ctrls.nav', [
-  'webui.services.configuration', 'webui.services.modals',
-  'webui.services.rpc', 'webui.services.rpc.helpers',
-  'webui.services.settings', 'webui.services.utils'
+	'webui.services.configuration', 'webui.services.modals',
+	'webui.services.rpc', 'webui.services.rpc.helpers',
+	'webui.services.settings', 'webui.services.utils'
 ])
 .controller('NavCtrl', [
-  '$scope', '$modals',
-  '$rpc', '$rpchelpers', '$fileSettings',
-  '$globalSettings', '$globalExclude',
-  '$utils',
-  function(
-    scope, modals,
-    rpc, rhelpers, fsettings,
-    gsettings, gexclude,
-    utils
-  ) {
+	'$scope', '$modals',
+	'$rpc', '$rpchelpers', '$fileSettings',
+	'$globalSettings', '$globalExclude',
+	'$utils',
+	function(
+		scope, modals,
+		rpc, rhelpers, fsettings,
+		gsettings, gexclude,
+		utils
+	) {
 
-  scope.isFeatureEnabled = function(f) { return rhelpers.isFeatureEnabled(f) };
+	scope.isFeatureEnabled = function(f) { return rhelpers.isFeatureEnabled(f) };
 
-  // initially collapsed in mobile resolution
-  scope.collapsed = true;
+	// initially collapsed in mobile resolution
+	scope.collapsed = true;
 
-  scope.onDownloadFilter = function() {
-    // Forward to MainCtrl.
-    scope.$parent.downloadFilter = scope.downloadFilter;
-    scope.$parent.onDownloadFilter();
-  };
+	scope.onDownloadFilter = function() {
+		// Forward to MainCtrl.
+		scope.$parent.downloadFilter = scope.downloadFilter;
+		scope.$parent.onDownloadFilter();
+	};
 
-  // manage download functions
-  scope.forcePauseAll = function() {
-    rpc.once('forcePauseAll', []);
-  }
+	// manage download functions
+	scope.forcePauseAll = function() {
+		rpc.once('forcePauseAll', []);
+	}
 
-  scope.purgeDownloadResult = function() {
-    rpc.once('purgeDownloadResult', []);
-  }
+	scope.purgeDownloadResult = function() {
+		rpc.once('purgeDownloadResult', []);
+	}
 
-  scope.unpauseAll = function() {
-    rpc.once('unpauseAll', []);
-  }
+	scope.unpauseAll = function() {
+		rpc.once('unpauseAll', []);
+	}
 
-  scope.addUris = function() {
-    modals.invoke(
-      'getUris', _.bind(rhelpers.addUris, rhelpers)
-    );
-  };
+	scope.addUris = function() {
+		modals.invoke(
+			'getUris', _.bind(rhelpers.addUris, rhelpers)
+		);
+	};
 
-  scope.addTorrents = function() {
-    modals.invoke(
-      'getTorrents', _.bind(rhelpers.addTorrents, rhelpers)
-    );
-  };
+	scope.addMetalinks = function() {
+		modals.invoke(
+			'getMetalinks', _.bind(rhelpers.addMetalinks, rhelpers)
+		);
+	};
 
-  scope.addMetalinks = function() {
-    modals.invoke(
-      'getMetalinks', _.bind(rhelpers.addMetalinks, rhelpers)
-    );
-  };
+	scope.addTorrents = function() {
+		modals.invoke(
+			'getTorrents', _.bind(rhelpers.addTorrents, rhelpers)
+		);
+	};
 
-  scope.addTorrent = function() {
-    modals.invoke(
-      'getTorrent', _.bind(rhelpers.addTorrents, rhelpers)
-    );
-  };
+	scope.changeCSettings = function() {
+		modals.invoke(
+			'connection', rpc.getConfiguration(), _.bind(rpc.configure, rpc)
+		);
+	}
 
-  scope.changeCSettings = function() {
-    modals.invoke(
-      'connection', rpc.getConfiguration(), _.bind(rpc.configure, rpc)
-    );
-  }
+	scope.changeGSettings = function() {
+		rpc.once('getGlobalOption', [], function(data) {
+			var starred = utils.getCookie('aria2props');
+			if (!starred || !starred.indexOf) starred = [];
+			var vals = data[0];
+			var settings = {};
 
-  scope.changeGSettings = function() {
-    rpc.once('getGlobalOption', [], function(data) {
-      var starred = utils.getCookie('aria2props');
-      if (!starred || !starred.indexOf) starred = [];
-      var vals = data[0];
-      var settings = {};
+			// global settings divided into
+			// file settings + some global specific
+			// settings
 
-      // global settings divided into
-      // file settings + some global specific
-      // settings
+			_.forEach([fsettings, gsettings], function(sets) {
+				for (var i in sets) {
+					if (gexclude.indexOf(i) != -1) continue;
 
-      _.forEach([fsettings, gsettings], function(sets) {
-        for (var i in sets) {
-          if (gexclude.indexOf(i) != -1) continue;
+					settings[i] = _.cloneDeep(sets[i]);
+					settings[i].starred = starred.indexOf(i) != -1;
+				}
+			});
 
-          settings[i] = _.cloneDeep(sets[i]);
-          settings[i].starred = starred.indexOf(i) != -1;
-        }
-      });
+			for (var i in vals) {
+				if (i in gexclude) continue;
 
-      for (var i in vals) {
-        if (i in gexclude) continue;
+				if (!(i in settings)) {
+					settings[i] = { name: i, val: vals[i], desc: '', starred: starred.indexOf(i) != -1 };
+				}
 
-        if (!(i in settings)) {
-          settings[i] = { name: i, val: vals[i], desc: '', starred: starred.indexOf(i) != -1 };
-        }
+				else {
+					settings[i].val = vals[i];
+				}
+			}
 
-        else {
-          settings[i].val = vals[i];
-        }
-      }
+			modals.invoke(
+				'settings', _.cloneDeep(settings),
+				'Global Settings', 'Save', function(chsettings) {
 
-      modals.invoke(
-        'settings', _.cloneDeep(settings),
-        'Global Settings', 'Save', function(chsettings) {
+				var sets = {};
+				var starred = [];
+				for (var i in chsettings) {
+					// no need to change default values
+					if (settings[i].val != chsettings[i].val)
+						sets[i] = chsettings[i].val
 
-        var sets = {};
-        var starred = [];
-        for (var i in chsettings) {
-          // no need to change default values
-          if (settings[i].val != chsettings[i].val)
-              sets[i] = chsettings[i].val
+					if (chsettings[i].starred) {
+						starred.push(i);
+					}
+				};
 
-          if (chsettings[i].starred) {
-            starred.push(i);
-          }
-        };
+				console.log('saving aria2 settings:', sets);
+				console.log('saving aria2 starred:', starred);
 
-        console.log('saving aria2 settings:', sets);
-        console.log('saving aria2 starred:', starred);
+				rpc.once('changeGlobalOption', [sets]);
+				utils.setCookie('aria2props', starred);
+			});
+		});
+	};
 
-        rpc.once('changeGlobalOption', [sets]);
-        utils.setCookie('aria2props', starred);
-      });
-    });
-  };
+	scope.showServerInfo = function() {
+		modals.invoke(
+			'server_info'
+		);
+	};
 
-  scope.showServerInfo = function() {
-    modals.invoke(
-      'server_info'
-    );
-  };
-
-  scope.showAbout = function() {
-    modals.invoke(
-      'about'
-    );
-  }
+	scope.showAbout = function() {
+		modals.invoke(
+			'about'
+		);
+	}
 
 }]);
diff --git a/js/services/rpc/helpers.js b/js/services/rpc/helpers.js
index 8a6a487..ec3ce13 100644
--- a/js/services/rpc/helpers.js
+++ b/js/services/rpc/helpers.js
@@ -11,28 +11,28 @@ angular.module('webui.services.rpc.helpers', [
     getAria2Version: function() {
       return miscellaneous.version;
     },
-    addUris: function(uris, settings) {
+    addUris: function(uris, settings, cb) {
       _.each(uris, function(uri) {
         // passing true to batch all the addUri calls
-        rpc.once('addUri', [uri, settings], angular.noop, true);
+        rpc.once('addUri', [uri, settings], cb, true);
       });
 
       // now dispatch all addUri syscalls
       rpc.forceUpdate();
     },
-    addTorrents: function(txts, settings) {
+    addTorrents: function(txts, settings, cb) {
       _.each(txts, function(txt) {
         // passing true to batch all the addUri calls
-        rpc.once('addTorrent', [txt, [], settings], angular.noop, true);
+        rpc.once('addTorrent', [txt, [], settings], cb, true);
       });
 
       // now dispatch all addUri syscalls
       rpc.forceUpdate();
     },
-    addMetalinks: function(txts, settings) {
+    addMetalinks: function(txts, settings, cb) {
       _.each(txts, function(txt) {
         // passing true to batch all the addUri calls
-        rpc.once('addMetalink', [txt, settings], angular.noop, true);
+        rpc.once('addMetalink', [txt, settings], cb, true);
       });
 
       // now dispatch all addUri syscalls