diff --git a/App-debug.html b/App-debug.html
index 60d91ee..261e870 100644
--- a/App-debug.html
+++ b/App-debug.html
@@ -17,7 +17,7 @@
             Rally.launchApp('CustomApp', {
                 name:"portfolio-item-copy",
                 parentRepos:"",
-                version:"1.0.1"
+                version:"1.0.2"
             });
         }, true);
     </script>
diff --git a/App.js b/App.js
index e0e7ab6..76ae6dc 100644
--- a/App.js
+++ b/App.js
@@ -12,7 +12,8 @@ Ext.define('CustomApp', {
         defaultSettings: {
             portfolioitem : [''],
             hierarchicalrequirement : ["ScheduleState","PlanEstimate"],
-            task : ["State","Estimate","TaskIndex","ToDo","Actuals"]
+            task : ["State","Estimate","TaskIndex","ToDo","Actuals"],
+            preserve_rank: true,
         }
     },
 
@@ -103,7 +104,9 @@ Ext.define('CustomApp', {
             success: function(requiredFields) {
                 app.requiredFields = requiredFields;
                 // make sure required fields are part of the settings:
-                Ext.apply(app.fieldsToCopy, requiredFields);
+                _.each(_.keys(app.fieldsToCopy), function(type) {
+                    app.fieldsToCopy[type] = _.uniq(app.fieldsToCopy[type].concat(requiredFields[type]));
+                });
                 
                 if ( Ext.Array.contains( requiredFields.hierarchicalrequirement, 'Release' )) {
                     this.down('#release-label').setText('Default Release:');
@@ -134,7 +137,7 @@ Ext.define('CustomApp', {
             title: 'Choose Item',
             listeners: {
                 artifactChosen: function(dialog, selectedRecord){
-                    this.down("#item-label").setText(selectedRecord.get('Name'));
+                    this.down("#item-label").setText(selectedRecord.get('FormattedID') + ' - ' + selectedRecord.get('Name'));
                     this.down("#copy-button").setDisabled(true);
                     app.itemSelected(selectedRecord);
 
@@ -148,6 +151,8 @@ Ext.define('CustomApp', {
     // updates the summary message.
     itemSelected : function(root) {
 
+        app.setLoading('Analyzing hierarchy...');
+        
         var config = {   model : "PortfolioItem",
             fetch : true,
             filters : [ { property : "ObjectID", operator : "=", value: root.get("ObjectID") } ]
@@ -174,8 +179,11 @@ Ext.define('CustomApp', {
                     // check project selected before enabling.
                     var projectRef = app.down("#project-picker").getValue();
 
-                    if (projectRef !== null && projectRef !== "")
+                    if (projectRef !== null && projectRef !== "") {
                         app.down("#copy-button").setDisabled(false);
+                    }
+
+                    app.setLoading(false);
                 });
             });
         });
@@ -282,7 +290,8 @@ Ext.define('CustomApp', {
             callback: function(result, operation) {
                 if (operation.success===true) {
                     app.copyList[item.source.get("_ref")] = result.get("_ref");
-                    app.down("#summary").setText("Created " + result.get("FormattedID"));
+                    app.down("#summary").setText('(' + _.keys(app.copyList).length + ' of ' + app.list.length + '): ' +
+                        "Created " + result.get("FormattedID") + ' - ' + result.get("Name"));
                     callback(null,result);
                 } else { 
                     console.log("Error:",operation);
@@ -299,7 +308,13 @@ Ext.define('CustomApp', {
 
     // reads a rally collection object
     readCollection : function( collectionConfig, callback ) {
-        collectionConfig.reference.getCollection(collectionConfig.type,{fetch:true}).load({
+        var rank_field = Rally.data.Ranker.getRankField(collectionConfig.reference);
+        var direction = collectionConfig.direction;
+
+        collectionConfig.reference.getCollection(collectionConfig.type, {
+            fetch: true,
+            sorters: [ { property: rank_field, direction: direction} ]
+        }).load({
             fetch : true,
             callback : function(records,operation,success) {
                 callback(null,records);
@@ -311,7 +326,8 @@ Ext.define('CustomApp', {
     // recursive method to create a list of all items to be copied.
     createList : function(root,callback) {
 
-        var config = {   model : root.raw._type,
+        var config = {   
+                model : root.raw._type,
                 fetch : true,
                 filters : [ { property : "ObjectID", operator : "=", value: root.get("ObjectID") } ]
         };
@@ -319,13 +335,18 @@ Ext.define('CustomApp', {
         async.map([config], wsapiQuery, function(err,results) {
 
             var obj = results[0][0];
+            var direction = "DESC";
             app.list.push(obj);
             var childRef = null;
             if (app.defined(obj.get("Tasks"))) {
                 childRef = "Tasks";
+                direction = "DESC";
             } else {
-                if (app.defined(obj.get("Children"))){
+                if (app.defined(obj.get("Children"))) {
                     childRef = "Children";
+                    if (/PortfolioItem/.test(root.raw._type)) {
+                        direction = "ASC";
+                    }
                 } else {
                     if (app.defined(obj.get("UserStories"))) {
                         childRef = "UserStories";
@@ -334,13 +355,22 @@ Ext.define('CustomApp', {
             }
 
             if (app.isObject(childRef)) {
-                var config = { reference : obj, type : childRef };
-                async.map([config],app.readCollection,function(err,results){
-                    var children = results[0];
-                    async.map(children,app.createList,function(err,results){
-                        callback(null,results);
+                var config = { reference : obj, type : childRef, direction: direction };
+                if ( app.getSetting('preserve_rank') && app.getSetting('preserve_rank') != "false" ) {
+                    async.mapSeries([config],app.readCollection,function(err,results){
+                        var children = results[0];
+                        async.mapSeries(children,app.createList,function(err,results){
+                            callback(null,results);
+                        });
                     });
-                });
+                } else {
+                    async.map([config],app.readCollection,function(err,results){
+                        var children = results[0];
+                        async.map(children,app.createList,function(err,results){
+                            callback(null,results);
+                        });
+                    });
+                }
             } else {
                 callback(null,obj);
             }
@@ -394,6 +424,7 @@ Ext.define('CustomApp', {
             model : config.model,
             fetch : config.fetch,
             filters : config.filters,
+            sorters: config.sorters,
             listeners : {
                 scope : this,
                 load : function(store, data) {
@@ -442,14 +473,21 @@ Ext.define('CustomApp', {
     },
     
     getSettingsFields: function() {
-        return [{
+        return [
+            {
+                name: 'preserve_rank',
+                xtype: 'rallycheckboxfield',
+                margin: '10px 0 10px 0',
+                fieldLabel: 'Maintain Ranks'
+            },
+            {
             name: 'portfolioitem',
             xtype: 'rallyfieldpicker',
             autoExpand: true,
             alwaysExpanded: false,
-            modelTypes: ['PortfolioItem/Feature'],
+            modelTypes: ['PortfolioItem'],
             margin: '10px 0 10px 0',
-            fieldLabel: 'Feature Fields',
+            fieldLabel: 'Portfolio Item Fields',
             _shouldShowField: function(field) {
                 //console.log(field.name, field);
                 var attr = field.attributeDefinition;
diff --git a/README.md b/README.md
index b3085d7..59d49cf 100644
--- a/README.md
+++ b/README.md
@@ -14,14 +14,30 @@ By default, it copies the following fields:
 
 If there are required fields, the app will attempt to copy those fields, as well.  If the Release field is required for stories, the app will present the user with a drop-down box for default release to put in as a placeholder for any parent stories that are being copied.  (A parent story cannot have a release, so if it's required, a parent being copied will fail to copy because the story is first created as a standalone and then becomes a parent when a child is assigned to it.)
 
-In addition, the app can be configured to copy additional fields by using Edit App Settings...  
+![](images/screenshot.png)
 
-![alt text](https://raw.githubusercontent.com/wrackzone/portfolio-item-copy/master/screenshot.png "Screenshot")
+## Settings
 
+This app can be configured via the Edit App Settings gear menu item.
+
+![](images/settings.png)
+
+### Maintain Ranks  
+
+This allows for the rank order to be maintained in the copy.  For large trees, this could be slower.  (default: true)
+
+### Feature Fields
+
+Use to set additional fields from PortfolioItems to copy beyond the default and required fields.
+
+### Story Fields
+
+Use to set additional fields from User Stories to copy beyond the default and required fields.
+
+### Task Fields
+
+Use to set additional fields from Tasks to copy beyond the default and required fields.
 
-## License
 
-AppTemplate is released under the MIT license.  See the file [LICENSE](./LICENSE) for the full text.
 
-##Documentation for SDK
 
diff --git a/deploy/App-external.html b/deploy/App-external.html
index 2bf95ec..e23c1b5 100644
--- a/deploy/App-external.html
+++ b/deploy/App-external.html
@@ -8,13 +8,13 @@
 
     <script type="text/javascript">
         Rally.onReady(function () {
-                var app=null;Ext.define("CustomApp",{extend:"Rally.app.App",componentCls:"app",layout:{type:"table",columns:2},config:{defaultSettings:{portfolioitem:[""],hierarchicalrequirement:["ScheduleState","PlanEstimate"],task:["State","Estimate","TaskIndex","ToDo","Actuals"]}},items:[{xtype:"label",text:"Copy To Project:",padding:"5px"},{id:"project-picker",xtype:"rallyprojectpicker",margin:"5px",model:"Project",field:"Name"},{xtype:"rallybutton",text:"Select Portfolio Item",margin:"5px",handler:function(){app.chooseItem()}},{id:"item-label",xtype:"label",margin:5,style:"font-weight:bold;",text:""},{itemId:"release-label",xtype:"label",padding:5,text:""},{itemId:"release-chooser",xtype:"container",margin:5},{id:"copy-button",xtype:"rallybutton",text:"Copy",margin:"5px",disabled:!0,handler:function(){app.performCopy()}},{id:"summary",xtype:"label",margin:"5px",style:"font-weight:bold;",text:""}],launch:function(){app=this;var e={portfolioitem:this.getSetting("portfolioitem"),hierarchicalrequirement:this.getSetting("hierarchicalrequirement"),task:this.getSetting("task")};Ext.isEmpty(e.portfolioitem)||Ext.isArray(e.portfolioitem)||(e.portfolioitem=e.portfolioitem.split(",")),Ext.isEmpty(e.hierarchicalrequirement)||Ext.isArray(e.hierarchicalrequirement)||(e.hierarchicalrequirement=e.hierarchicalrequirement.split(",")),Ext.isEmpty(e.task)||Ext.isArray(e.task)||(e.task=e.task.split(",")),app.fieldsToCopy=e,this._getRequiredFields().then({scope:this,success:function(e){app.requiredFields=e,Ext.apply(app.fieldsToCopy,e),Ext.Array.contains(e.hierarchicalrequirement,"Release")&&(this.down("#release-label").setText("Default Release:"),this.down("#release-chooser").removeAll(),this.down("#release-chooser").add({xtype:"rallyreleasecombobox",showArrows:!1}))}})},chooseItem:function(){Ext.create("Rally.ui.dialog.ArtifactChooserDialog",{artifactTypes:["PortfolioItem"],autoShow:!0,_isArtifactEditable:function(e){return!0},title:"Choose Item",listeners:{artifactChosen:function(e,t){this.down("#item-label").setText(t.get("Name")),this.down("#copy-button").setDisabled(!0),app.itemSelected(t)},scope:this}})},itemSelected:function(e){var t={model:"PortfolioItem",fetch:!0,filters:[{property:"ObjectID",operator:"=",value:e.get("ObjectID")}]};async.map([t],app.wsapiQuery,function(e,t){var r=t[0][0];app.list=[],async.map([r],app.createList,function(e,t){app.models={},app.types=_.uniq(_.map(app.list,function(e){return e.get("_type")})),async.mapSeries(app.types,app.loadModel,function(e,t){_.each(app.types,function(e,r){app.models[e]=t[r]}),app.down("#summary").setText(app.list.length+" Items to be copied");var r=app.down("#project-picker").getValue();null!==r&&""!==r&&app.down("#copy-button").setDisabled(!1)})})})},performCopy:function(){app.copyList={},app.projectRef=app.down("#project-picker").getValue(),async.mapSeries(app.list,app.copyItem,function(e,t){null===e?app.down("#summary").setText(t.length+" Items copied to "+t[0].get("FormattedID")):app.down("#summary").setText(e,!1)})},copyItem:function(e,t){var r={Name:e.get("Name"),Workspace:e.get("Workspace")._ref,Description:e.get("Description"),Owner:null!==e.get("Owner")?e.get("Owner")._ref:null,DisplayColor:_.isNull(e.get("DisplayColor"))||_.isUndefined(e.get("DisplayColor"))?null:e.get("DisplayColor")};r=app.copyTypeSpecificFields(r,e);var a=app.parentRef(e);if(null!==a){var i=app.copyList[a.ref];_.isUndefined(i)||(r[a.type]=i)}var o=app.models[e.get("_type")];async.map([{model:o,copy:r,source:e}],app.createItem,function(e,r){_.isUndefined(e)||_.isNull(e)?t(null,r[0]):t(e,null)})},copyTypeSpecificFields:function(e,t){var r=-1!==t.get("_type").toLowerCase().indexOf("portfolioitem")?"portfolioitem":t.get("_type");if(reference_fields=["Release","Iteration","Owner"],Ext.Array.each(this.fieldsToCopy[r],function(r){var a=this._getRelease(t);"FlowState"===r?Rally.util.Ref.getRelativeUri(t.get("Project"))===app.projectRef&&(e[r]=Rally.util.Ref.getRelativeUri(t.get("FlowState"))):!Ext.isEmpty(a)&&Ext.Array.contains(reference_fields,r)?e[r]={_ref:a._ref}:e[r]=t.get(r)},this),t.get("Tags").Count>0){var a=_.map(t.get("Tags")._tagsNameArray,function(e){return{_ref:e._ref}});e.Tags=a}return e},_getRelease:function(e){var t=e.get("Release");return Ext.isEmpty(t)&&this.down("rallyreleasecombobox")&&(t=this.down("rallyreleasecombobox").getRecord().getData()),t},createItem:function(e,t){var r=Ext.create(e.model,e.copy);r.set("Project",app.projectRef),r.save({callback:function(r,a){if(!0===a.success)app.copyList[e.source.get("_ref")]=r.get("_ref"),app.down("#summary").setText("Created "+r.get("FormattedID")),t(null,r);else{console.log("Error:",a);var i="<span class='icon-warning'> </span>Create Error when copying "+e.copy.Name;Ext.isEmpty(a.error)||Ext.isEmpty(a.error.errors)||(i+=":<br/>"+a.error.errors.join("<br/>")),t(i,null)}}})},readCollection:function(e,t){e.reference.getCollection(e.type,{fetch:!0}).load({fetch:!0,callback:function(e,r,a){t(null,e)}})},createList:function(e,t){var r={model:e.raw._type,fetch:!0,filters:[{property:"ObjectID",operator:"=",value:e.get("ObjectID")}]};async.map([r],wsapiQuery,function(e,r){var a=r[0][0];app.list.push(a);var i=null;if(app.defined(a.get("Tasks"))?i="Tasks":app.defined(a.get("Children"))?i="Children":app.defined(a.get("UserStories"))&&(i="UserStories"),app.isObject(i)){var o={reference:a,type:i};async.map([o],app.readCollection,function(e,r){var a=r[0];async.map(a,app.createList,function(e,r){t(null,r)})})}else t(null,a)})},parentRef:function(e){return _.isObject(e.get("Parent"))?{type:"Parent",ref:e.get("Parent")._ref}:_.isObject(e.get("WorkProduct"))?{type:"WorkProduct",ref:e.get("WorkProduct")._ref}:_.isObject(e.get("PortfolioItem"))?{type:"PortfolioItem",ref:e.get("PortfolioItem")._ref}:null},loadModel:function(e,t){Rally.data.ModelFactory.getModel({type:e,success:function(e){t(null,e)}})},isObject:function(e){return!_.isUndefined(e)&&!_.isNull(e)},defined:function(e){return app.isObject(e)&&e.Count>0},wsapiQuery:function(e,t){Ext.create("Rally.data.WsapiDataStore",{autoLoad:!0,context:{project:null,workspace:app.getContext().getWorkspaceRef()},limit:"Infinity",model:e.model,fetch:e.fetch,filters:e.filters,listeners:{scope:this,load:function(e,r){t(null,r)}}})},_getRequiredFields:function(){var e=Ext.create("Deft.Deferred");return Deft.Promise.all([this._getRequiredFieldsForModel("portfolioitem"),this._getRequiredFieldsForModel("hierarchicalrequirement"),this._getRequiredFieldsForModel("task")]).then({scope:this,success:function(t){e.resolve({portfolioitem:t[0],hierarchicalrequirement:t[1],task:t[2]})}}),e.promise},_getRequiredFieldsForModel:function(e){var t=Ext.create("Deft.Deferred");return Rally.data.ModelFactory.getModel({type:e,success:function(e){var r=e.getFields(),a=[];Ext.Array.each(r,function(e){e.required&&!e.readOnly&&a.push(e.name)}),t.resolve(a)}}),t.promise},getSettingsFields:function(){return[{name:"portfolioitem",xtype:"rallyfieldpicker",autoExpand:!0,alwaysExpanded:!1,modelTypes:["PortfolioItem/Feature"],margin:"10px 0 10px 0",fieldLabel:"Feature Fields",_shouldShowField:function(e){var t=e.attributeDefinition;return t&&!t.ReadOnly&&"COLLECTION"!==t.AttributeType},listeners:{ready:function(e){e.collapse()}},readyEvent:"ready"},{name:"hierarchicalrequirement",xtype:"rallyfieldpicker",autoExpand:!0,alwaysExpanded:!1,modelTypes:["HierarchicalRequirement"],margin:"10px 0 10px 0",fieldLabel:"Story Fields",_shouldShowField:function(e){var t=e.attributeDefinition;return t&&!t.ReadOnly&&"COLLECTION"!==t.AttributeType},listeners:{ready:function(e){e.collapse()}},readyEvent:"ready"},{name:"task",xtype:"rallyfieldpicker",autoExpand:!0,alwaysExpanded:!1,modelTypes:["Task"],margin:"10px 0 200px 0",fieldLabel:"Task Fields",_shouldShowField:function(e){var t=e.attributeDefinition;return t&&!t.ReadOnly&&"COLLECTION"!==t.AttributeType},listeners:{ready:function(e){e.collapse()}},readyEvent:"ready"}]},isExternal:function(){return void 0===this.getAppId()},onSettingsUpdate:function(e){console.log("onSettingsUpdate",e),Ext.apply(this,e),this.launch()}});
+                var app=null;Ext.define("CustomApp",{extend:"Rally.app.App",componentCls:"app",layout:{type:"table",columns:2},config:{defaultSettings:{portfolioitem:[""],hierarchicalrequirement:["ScheduleState","PlanEstimate"],task:["State","Estimate","TaskIndex","ToDo","Actuals"],preserve_rank:!0}},items:[{xtype:"label",text:"Copy To Project:",padding:"5px"},{id:"project-picker",xtype:"rallyprojectpicker",margin:"5px",model:"Project",field:"Name"},{xtype:"rallybutton",text:"Select Portfolio Item",margin:"5px",handler:function(){app.chooseItem()}},{id:"item-label",xtype:"label",margin:5,style:"font-weight:bold;",text:""},{itemId:"release-label",xtype:"label",padding:5,text:""},{itemId:"release-chooser",xtype:"container",margin:5},{id:"copy-button",xtype:"rallybutton",text:"Copy",margin:"5px",disabled:!0,handler:function(){app.performCopy()}},{id:"summary",xtype:"label",margin:"5px",style:"font-weight:bold;",text:""}],launch:function(){app=this;var e={portfolioitem:this.getSetting("portfolioitem"),hierarchicalrequirement:this.getSetting("hierarchicalrequirement"),task:this.getSetting("task")};Ext.isEmpty(e.portfolioitem)||Ext.isArray(e.portfolioitem)||(e.portfolioitem=e.portfolioitem.split(",")),Ext.isEmpty(e.hierarchicalrequirement)||Ext.isArray(e.hierarchicalrequirement)||(e.hierarchicalrequirement=e.hierarchicalrequirement.split(",")),Ext.isEmpty(e.task)||Ext.isArray(e.task)||(e.task=e.task.split(",")),app.fieldsToCopy=e,this._getRequiredFields().then({scope:this,success:function(e){app.requiredFields=e,_.each(_.keys(app.fieldsToCopy),function(t){app.fieldsToCopy[t]=_.uniq(app.fieldsToCopy[t].concat(e[t]))}),Ext.Array.contains(e.hierarchicalrequirement,"Release")&&(this.down("#release-label").setText("Default Release:"),this.down("#release-chooser").removeAll(),this.down("#release-chooser").add({xtype:"rallyreleasecombobox",showArrows:!1}))}})},chooseItem:function(){Ext.create("Rally.ui.dialog.ArtifactChooserDialog",{artifactTypes:["PortfolioItem"],autoShow:!0,_isArtifactEditable:function(e){return!0},title:"Choose Item",listeners:{artifactChosen:function(e,t){this.down("#item-label").setText(t.get("FormattedID")+" - "+t.get("Name")),this.down("#copy-button").setDisabled(!0),app.itemSelected(t)},scope:this}})},itemSelected:function(e){app.setLoading("Analyzing hierarchy...");var t={model:"PortfolioItem",fetch:!0,filters:[{property:"ObjectID",operator:"=",value:e.get("ObjectID")}]};async.map([t],app.wsapiQuery,function(e,t){var r=t[0][0];app.list=[],async.map([r],app.createList,function(e,t){app.models={},app.types=_.uniq(_.map(app.list,function(e){return e.get("_type")})),async.mapSeries(app.types,app.loadModel,function(e,t){_.each(app.types,function(e,r){app.models[e]=t[r]}),app.down("#summary").setText(app.list.length+" Items to be copied");var r=app.down("#project-picker").getValue();null!==r&&""!==r&&app.down("#copy-button").setDisabled(!1),app.setLoading(!1)})})})},performCopy:function(){app.copyList={},app.projectRef=app.down("#project-picker").getValue(),async.mapSeries(app.list,app.copyItem,function(e,t){null===e?app.down("#summary").setText(t.length+" Items copied to "+t[0].get("FormattedID")):app.down("#summary").setText(e,!1)})},copyItem:function(e,t){var r={Name:e.get("Name"),Workspace:e.get("Workspace")._ref,Description:e.get("Description"),Owner:null!==e.get("Owner")?e.get("Owner")._ref:null,DisplayColor:_.isNull(e.get("DisplayColor"))||_.isUndefined(e.get("DisplayColor"))?null:e.get("DisplayColor")};r=app.copyTypeSpecificFields(r,e);var a=app.parentRef(e);if(null!==a){var i=app.copyList[a.ref];_.isUndefined(i)||(r[a.type]=i)}var o=app.models[e.get("_type")];async.map([{model:o,copy:r,source:e}],app.createItem,function(e,r){_.isUndefined(e)||_.isNull(e)?t(null,r[0]):t(e,null)})},copyTypeSpecificFields:function(e,t){var r=-1!==t.get("_type").toLowerCase().indexOf("portfolioitem")?"portfolioitem":t.get("_type");if(reference_fields=["Release","Iteration","Owner"],Ext.Array.each(this.fieldsToCopy[r],function(r){var a=this._getRelease(t);"FlowState"===r?Rally.util.Ref.getRelativeUri(t.get("Project"))===app.projectRef&&(e[r]=Rally.util.Ref.getRelativeUri(t.get("FlowState"))):!Ext.isEmpty(a)&&Ext.Array.contains(reference_fields,r)?e[r]={_ref:a._ref}:e[r]=t.get(r)},this),t.get("Tags").Count>0){var a=_.map(t.get("Tags")._tagsNameArray,function(e){return{_ref:e._ref}});e.Tags=a}return e},_getRelease:function(e){var t=e.get("Release");return Ext.isEmpty(t)&&this.down("rallyreleasecombobox")&&(t=this.down("rallyreleasecombobox").getRecord().getData()),t},createItem:function(e,t){var r=Ext.create(e.model,e.copy);r.set("Project",app.projectRef),r.save({callback:function(r,a){if(!0===a.success)app.copyList[e.source.get("_ref")]=r.get("_ref"),app.down("#summary").setText("("+_.keys(app.copyList).length+" of "+app.list.length+"): Created "+r.get("FormattedID")+" - "+r.get("Name")),t(null,r);else{console.log("Error:",a);var i="<span class='icon-warning'> </span>Create Error when copying "+e.copy.Name;Ext.isEmpty(a.error)||Ext.isEmpty(a.error.errors)||(i+=":<br/>"+a.error.errors.join("<br/>")),t(i,null)}}})},readCollection:function(e,t){var r=Rally.data.Ranker.getRankField(e.reference),a=e.direction;e.reference.getCollection(e.type,{fetch:!0,sorters:[{property:r,direction:a}]}).load({fetch:!0,callback:function(e,r,a){t(null,e)}})},createList:function(e,t){var r={model:e.raw._type,fetch:!0,filters:[{property:"ObjectID",operator:"=",value:e.get("ObjectID")}]};async.map([r],wsapiQuery,function(r,a){var i=a[0][0],o="DESC";app.list.push(i);var n=null;if(app.defined(i.get("Tasks"))?(n="Tasks",o="DESC"):app.defined(i.get("Children"))?(n="Children",/PortfolioItem/.test(e.raw._type)&&(o="ASC")):app.defined(i.get("UserStories"))&&(n="UserStories"),app.isObject(n)){var l={reference:i,type:n,direction:o};app.getSetting("preserve_rank")&&"false"!=app.getSetting("preserve_rank")?async.mapSeries([l],app.readCollection,function(e,r){var a=r[0];async.mapSeries(a,app.createList,function(e,r){t(null,r)})}):async.map([l],app.readCollection,function(e,r){var a=r[0];async.map(a,app.createList,function(e,r){t(null,r)})})}else t(null,i)})},parentRef:function(e){return _.isObject(e.get("Parent"))?{type:"Parent",ref:e.get("Parent")._ref}:_.isObject(e.get("WorkProduct"))?{type:"WorkProduct",ref:e.get("WorkProduct")._ref}:_.isObject(e.get("PortfolioItem"))?{type:"PortfolioItem",ref:e.get("PortfolioItem")._ref}:null},loadModel:function(e,t){Rally.data.ModelFactory.getModel({type:e,success:function(e){t(null,e)}})},isObject:function(e){return!_.isUndefined(e)&&!_.isNull(e)},defined:function(e){return app.isObject(e)&&e.Count>0},wsapiQuery:function(e,t){Ext.create("Rally.data.WsapiDataStore",{autoLoad:!0,context:{project:null,workspace:app.getContext().getWorkspaceRef()},limit:"Infinity",model:e.model,fetch:e.fetch,filters:e.filters,sorters:e.sorters,listeners:{scope:this,load:function(e,r){t(null,r)}}})},_getRequiredFields:function(){var e=Ext.create("Deft.Deferred");return Deft.Promise.all([this._getRequiredFieldsForModel("portfolioitem"),this._getRequiredFieldsForModel("hierarchicalrequirement"),this._getRequiredFieldsForModel("task")]).then({scope:this,success:function(t){e.resolve({portfolioitem:t[0],hierarchicalrequirement:t[1],task:t[2]})}}),e.promise},_getRequiredFieldsForModel:function(e){var t=Ext.create("Deft.Deferred");return Rally.data.ModelFactory.getModel({type:e,success:function(e){var r=e.getFields(),a=[];Ext.Array.each(r,function(e){e.required&&!e.readOnly&&a.push(e.name)}),t.resolve(a)}}),t.promise},getSettingsFields:function(){return[{name:"preserve_rank",xtype:"rallycheckboxfield",margin:"10px 0 10px 0",fieldLabel:"Maintain Ranks"},{name:"portfolioitem",xtype:"rallyfieldpicker",autoExpand:!0,alwaysExpanded:!1,modelTypes:["PortfolioItem"],margin:"10px 0 10px 0",fieldLabel:"Portfolio Item Fields",_shouldShowField:function(e){var t=e.attributeDefinition;return t&&!t.ReadOnly&&"COLLECTION"!==t.AttributeType},listeners:{ready:function(e){e.collapse()}},readyEvent:"ready"},{name:"hierarchicalrequirement",xtype:"rallyfieldpicker",autoExpand:!0,alwaysExpanded:!1,modelTypes:["HierarchicalRequirement"],margin:"10px 0 10px 0",fieldLabel:"Story Fields",_shouldShowField:function(e){var t=e.attributeDefinition;return t&&!t.ReadOnly&&"COLLECTION"!==t.AttributeType},listeners:{ready:function(e){e.collapse()}},readyEvent:"ready"},{name:"task",xtype:"rallyfieldpicker",autoExpand:!0,alwaysExpanded:!1,modelTypes:["Task"],margin:"10px 0 200px 0",fieldLabel:"Task Fields",_shouldShowField:function(e){var t=e.attributeDefinition;return t&&!t.ReadOnly&&"COLLECTION"!==t.AttributeType},listeners:{ready:function(e){e.collapse()}},readyEvent:"ready"}]},isExternal:function(){return void 0===this.getAppId()},onSettingsUpdate:function(e){console.log("onSettingsUpdate",e),Ext.apply(this,e),this.launch()}});
                 function getReleaseTimeBox(t){var e=t.getContext().getTimeboxScope(),n=null;e?n=e.getRecord().get("Name"):n="";return n}function wsapiQuery(t,e){Ext.create("Rally.data.WsapiDataStore",{autoLoad:!0,limit:"Infinity",context:{project:null,workspace:Rally.environment.getContext().getWorkspaceRef()},model:t.model,fetch:t.fetch,filters:t.filters,listeners:{scope:this,load:function(t,n){e(null,n)}}})}function snapshotQuery(t,e){var n={find:t.find,fetch:t.fetch,hydrate:t.hydrate,autoLoad:!0,pageSize:1e4,limit:"Infinity",listeners:{scope:this,load:function(t,n,o){console.log("snapshots:",n.length),e(null,n)}}};Ext.create("Rally.data.lookback.SnapshotStore",n)}function pointsUnitType(t){return"Points"==t}
 
             Rally.launchApp('CustomApp', {
                 name:"portfolio-item-copy",
                 parentRepos:"",
-                version:"1.0.1"
+                version:"1.0.2"
             });
 
         });
diff --git a/deploy/App-uncompressed.html b/deploy/App-uncompressed.html
index 787b342..d36c29e 100644
--- a/deploy/App-uncompressed.html
+++ b/deploy/App-uncompressed.html
@@ -22,7 +22,8 @@
         defaultSettings: {
             portfolioitem : [''],
             hierarchicalrequirement : ["ScheduleState","PlanEstimate"],
-            task : ["State","Estimate","TaskIndex","ToDo","Actuals"]
+            task : ["State","Estimate","TaskIndex","ToDo","Actuals"],
+            preserve_rank: true,
         }
     },
 
@@ -113,7 +114,9 @@
             success: function(requiredFields) {
                 app.requiredFields = requiredFields;
                 // make sure required fields are part of the settings:
-                Ext.apply(app.fieldsToCopy, requiredFields);
+                _.each(_.keys(app.fieldsToCopy), function(type) {
+                    app.fieldsToCopy[type] = _.uniq(app.fieldsToCopy[type].concat(requiredFields[type]));
+                });
                 
                 if ( Ext.Array.contains( requiredFields.hierarchicalrequirement, 'Release' )) {
                     this.down('#release-label').setText('Default Release:');
@@ -144,7 +147,7 @@
             title: 'Choose Item',
             listeners: {
                 artifactChosen: function(dialog, selectedRecord){
-                    this.down("#item-label").setText(selectedRecord.get('Name'));
+                    this.down("#item-label").setText(selectedRecord.get('FormattedID') + ' - ' + selectedRecord.get('Name'));
                     this.down("#copy-button").setDisabled(true);
                     app.itemSelected(selectedRecord);
 
@@ -158,6 +161,8 @@
     // updates the summary message.
     itemSelected : function(root) {
 
+        app.setLoading('Analyzing hierarchy...');
+        
         var config = {   model : "PortfolioItem",
             fetch : true,
             filters : [ { property : "ObjectID", operator : "=", value: root.get("ObjectID") } ]
@@ -184,8 +189,11 @@
                     // check project selected before enabling.
                     var projectRef = app.down("#project-picker").getValue();
 
-                    if (projectRef !== null && projectRef !== "")
+                    if (projectRef !== null && projectRef !== "") {
                         app.down("#copy-button").setDisabled(false);
+                    }
+
+                    app.setLoading(false);
                 });
             });
         });
@@ -292,7 +300,8 @@
             callback: function(result, operation) {
                 if (operation.success===true) {
                     app.copyList[item.source.get("_ref")] = result.get("_ref");
-                    app.down("#summary").setText("Created " + result.get("FormattedID"));
+                    app.down("#summary").setText('(' + _.keys(app.copyList).length + ' of ' + app.list.length + '): ' +
+                        "Created " + result.get("FormattedID") + ' - ' + result.get("Name"));
                     callback(null,result);
                 } else { 
                     console.log("Error:",operation);
@@ -309,7 +318,13 @@
 
     // reads a rally collection object
     readCollection : function( collectionConfig, callback ) {
-        collectionConfig.reference.getCollection(collectionConfig.type,{fetch:true}).load({
+        var rank_field = Rally.data.Ranker.getRankField(collectionConfig.reference);
+        var direction = collectionConfig.direction;
+
+        collectionConfig.reference.getCollection(collectionConfig.type, {
+            fetch: true,
+            sorters: [ { property: rank_field, direction: direction} ]
+        }).load({
             fetch : true,
             callback : function(records,operation,success) {
                 callback(null,records);
@@ -321,7 +336,8 @@
     // recursive method to create a list of all items to be copied.
     createList : function(root,callback) {
 
-        var config = {   model : root.raw._type,
+        var config = {   
+                model : root.raw._type,
                 fetch : true,
                 filters : [ { property : "ObjectID", operator : "=", value: root.get("ObjectID") } ]
         };
@@ -329,13 +345,18 @@
         async.map([config], wsapiQuery, function(err,results) {
 
             var obj = results[0][0];
+            var direction = "DESC";
             app.list.push(obj);
             var childRef = null;
             if (app.defined(obj.get("Tasks"))) {
                 childRef = "Tasks";
+                direction = "DESC";
             } else {
-                if (app.defined(obj.get("Children"))){
+                if (app.defined(obj.get("Children"))) {
                     childRef = "Children";
+                    if (/PortfolioItem/.test(root.raw._type)) {
+                        direction = "ASC";
+                    }
                 } else {
                     if (app.defined(obj.get("UserStories"))) {
                         childRef = "UserStories";
@@ -344,13 +365,22 @@
             }
 
             if (app.isObject(childRef)) {
-                var config = { reference : obj, type : childRef };
-                async.map([config],app.readCollection,function(err,results){
-                    var children = results[0];
-                    async.map(children,app.createList,function(err,results){
-                        callback(null,results);
+                var config = { reference : obj, type : childRef, direction: direction };
+                if ( app.getSetting('preserve_rank') && app.getSetting('preserve_rank') != "false" ) {
+                    async.mapSeries([config],app.readCollection,function(err,results){
+                        var children = results[0];
+                        async.mapSeries(children,app.createList,function(err,results){
+                            callback(null,results);
+                        });
                     });
-                });
+                } else {
+                    async.map([config],app.readCollection,function(err,results){
+                        var children = results[0];
+                        async.map(children,app.createList,function(err,results){
+                            callback(null,results);
+                        });
+                    });
+                }
             } else {
                 callback(null,obj);
             }
@@ -404,6 +434,7 @@
             model : config.model,
             fetch : config.fetch,
             filters : config.filters,
+            sorters: config.sorters,
             listeners : {
                 scope : this,
                 load : function(store, data) {
@@ -452,14 +483,21 @@
     },
     
     getSettingsFields: function() {
-        return [{
+        return [
+            {
+                name: 'preserve_rank',
+                xtype: 'rallycheckboxfield',
+                margin: '10px 0 10px 0',
+                fieldLabel: 'Maintain Ranks'
+            },
+            {
             name: 'portfolioitem',
             xtype: 'rallyfieldpicker',
             autoExpand: true,
             alwaysExpanded: false,
-            modelTypes: ['PortfolioItem/Feature'],
+            modelTypes: ['PortfolioItem'],
             margin: '10px 0 10px 0',
-            fieldLabel: 'Feature Fields',
+            fieldLabel: 'Portfolio Item Fields',
             _shouldShowField: function(field) {
                 //console.log(field.name, field);
                 var attr = field.attributeDefinition;
@@ -598,7 +636,7 @@
             Rally.launchApp('CustomApp', {
                 name:"portfolio-item-copy",
                 parentRepos:"",
-                version:"1.0.1"
+                version:"1.0.2"
             });
 
         });
diff --git a/deploy/App.html b/deploy/App.html
index 637f593..94cb6a0 100644
--- a/deploy/App.html
+++ b/deploy/App.html
@@ -8,13 +8,13 @@
 
     <script type="text/javascript">
         Rally.onReady(function () {
-                var app=null;Ext.define("CustomApp",{extend:"Rally.app.App",componentCls:"app",layout:{type:"table",columns:2},config:{defaultSettings:{portfolioitem:[""],hierarchicalrequirement:["ScheduleState","PlanEstimate"],task:["State","Estimate","TaskIndex","ToDo","Actuals"]}},items:[{xtype:"label",text:"Copy To Project:",padding:"5px"},{id:"project-picker",xtype:"rallyprojectpicker",margin:"5px",model:"Project",field:"Name"},{xtype:"rallybutton",text:"Select Portfolio Item",margin:"5px",handler:function(){app.chooseItem()}},{id:"item-label",xtype:"label",margin:5,style:"font-weight:bold;",text:""},{itemId:"release-label",xtype:"label",padding:5,text:""},{itemId:"release-chooser",xtype:"container",margin:5},{id:"copy-button",xtype:"rallybutton",text:"Copy",margin:"5px",disabled:!0,handler:function(){app.performCopy()}},{id:"summary",xtype:"label",margin:"5px",style:"font-weight:bold;",text:""}],launch:function(){app=this;var e={portfolioitem:this.getSetting("portfolioitem"),hierarchicalrequirement:this.getSetting("hierarchicalrequirement"),task:this.getSetting("task")};Ext.isEmpty(e.portfolioitem)||Ext.isArray(e.portfolioitem)||(e.portfolioitem=e.portfolioitem.split(",")),Ext.isEmpty(e.hierarchicalrequirement)||Ext.isArray(e.hierarchicalrequirement)||(e.hierarchicalrequirement=e.hierarchicalrequirement.split(",")),Ext.isEmpty(e.task)||Ext.isArray(e.task)||(e.task=e.task.split(",")),app.fieldsToCopy=e,this._getRequiredFields().then({scope:this,success:function(e){app.requiredFields=e,Ext.apply(app.fieldsToCopy,e),Ext.Array.contains(e.hierarchicalrequirement,"Release")&&(this.down("#release-label").setText("Default Release:"),this.down("#release-chooser").removeAll(),this.down("#release-chooser").add({xtype:"rallyreleasecombobox",showArrows:!1}))}})},chooseItem:function(){Ext.create("Rally.ui.dialog.ArtifactChooserDialog",{artifactTypes:["PortfolioItem"],autoShow:!0,_isArtifactEditable:function(e){return!0},title:"Choose Item",listeners:{artifactChosen:function(e,t){this.down("#item-label").setText(t.get("Name")),this.down("#copy-button").setDisabled(!0),app.itemSelected(t)},scope:this}})},itemSelected:function(e){var t={model:"PortfolioItem",fetch:!0,filters:[{property:"ObjectID",operator:"=",value:e.get("ObjectID")}]};async.map([t],app.wsapiQuery,function(e,t){var r=t[0][0];app.list=[],async.map([r],app.createList,function(e,t){app.models={},app.types=_.uniq(_.map(app.list,function(e){return e.get("_type")})),async.mapSeries(app.types,app.loadModel,function(e,t){_.each(app.types,function(e,r){app.models[e]=t[r]}),app.down("#summary").setText(app.list.length+" Items to be copied");var r=app.down("#project-picker").getValue();null!==r&&""!==r&&app.down("#copy-button").setDisabled(!1)})})})},performCopy:function(){app.copyList={},app.projectRef=app.down("#project-picker").getValue(),async.mapSeries(app.list,app.copyItem,function(e,t){null===e?app.down("#summary").setText(t.length+" Items copied to "+t[0].get("FormattedID")):app.down("#summary").setText(e,!1)})},copyItem:function(e,t){var r={Name:e.get("Name"),Workspace:e.get("Workspace")._ref,Description:e.get("Description"),Owner:null!==e.get("Owner")?e.get("Owner")._ref:null,DisplayColor:_.isNull(e.get("DisplayColor"))||_.isUndefined(e.get("DisplayColor"))?null:e.get("DisplayColor")};r=app.copyTypeSpecificFields(r,e);var a=app.parentRef(e);if(null!==a){var i=app.copyList[a.ref];_.isUndefined(i)||(r[a.type]=i)}var o=app.models[e.get("_type")];async.map([{model:o,copy:r,source:e}],app.createItem,function(e,r){_.isUndefined(e)||_.isNull(e)?t(null,r[0]):t(e,null)})},copyTypeSpecificFields:function(e,t){var r=-1!==t.get("_type").toLowerCase().indexOf("portfolioitem")?"portfolioitem":t.get("_type");if(reference_fields=["Release","Iteration","Owner"],Ext.Array.each(this.fieldsToCopy[r],function(r){var a=this._getRelease(t);"FlowState"===r?Rally.util.Ref.getRelativeUri(t.get("Project"))===app.projectRef&&(e[r]=Rally.util.Ref.getRelativeUri(t.get("FlowState"))):!Ext.isEmpty(a)&&Ext.Array.contains(reference_fields,r)?e[r]={_ref:a._ref}:e[r]=t.get(r)},this),t.get("Tags").Count>0){var a=_.map(t.get("Tags")._tagsNameArray,function(e){return{_ref:e._ref}});e.Tags=a}return e},_getRelease:function(e){var t=e.get("Release");return Ext.isEmpty(t)&&this.down("rallyreleasecombobox")&&(t=this.down("rallyreleasecombobox").getRecord().getData()),t},createItem:function(e,t){var r=Ext.create(e.model,e.copy);r.set("Project",app.projectRef),r.save({callback:function(r,a){if(!0===a.success)app.copyList[e.source.get("_ref")]=r.get("_ref"),app.down("#summary").setText("Created "+r.get("FormattedID")),t(null,r);else{console.log("Error:",a);var i="<span class='icon-warning'> </span>Create Error when copying "+e.copy.Name;Ext.isEmpty(a.error)||Ext.isEmpty(a.error.errors)||(i+=":<br/>"+a.error.errors.join("<br/>")),t(i,null)}}})},readCollection:function(e,t){e.reference.getCollection(e.type,{fetch:!0}).load({fetch:!0,callback:function(e,r,a){t(null,e)}})},createList:function(e,t){var r={model:e.raw._type,fetch:!0,filters:[{property:"ObjectID",operator:"=",value:e.get("ObjectID")}]};async.map([r],wsapiQuery,function(e,r){var a=r[0][0];app.list.push(a);var i=null;if(app.defined(a.get("Tasks"))?i="Tasks":app.defined(a.get("Children"))?i="Children":app.defined(a.get("UserStories"))&&(i="UserStories"),app.isObject(i)){var o={reference:a,type:i};async.map([o],app.readCollection,function(e,r){var a=r[0];async.map(a,app.createList,function(e,r){t(null,r)})})}else t(null,a)})},parentRef:function(e){return _.isObject(e.get("Parent"))?{type:"Parent",ref:e.get("Parent")._ref}:_.isObject(e.get("WorkProduct"))?{type:"WorkProduct",ref:e.get("WorkProduct")._ref}:_.isObject(e.get("PortfolioItem"))?{type:"PortfolioItem",ref:e.get("PortfolioItem")._ref}:null},loadModel:function(e,t){Rally.data.ModelFactory.getModel({type:e,success:function(e){t(null,e)}})},isObject:function(e){return!_.isUndefined(e)&&!_.isNull(e)},defined:function(e){return app.isObject(e)&&e.Count>0},wsapiQuery:function(e,t){Ext.create("Rally.data.WsapiDataStore",{autoLoad:!0,context:{project:null,workspace:app.getContext().getWorkspaceRef()},limit:"Infinity",model:e.model,fetch:e.fetch,filters:e.filters,listeners:{scope:this,load:function(e,r){t(null,r)}}})},_getRequiredFields:function(){var e=Ext.create("Deft.Deferred");return Deft.Promise.all([this._getRequiredFieldsForModel("portfolioitem"),this._getRequiredFieldsForModel("hierarchicalrequirement"),this._getRequiredFieldsForModel("task")]).then({scope:this,success:function(t){e.resolve({portfolioitem:t[0],hierarchicalrequirement:t[1],task:t[2]})}}),e.promise},_getRequiredFieldsForModel:function(e){var t=Ext.create("Deft.Deferred");return Rally.data.ModelFactory.getModel({type:e,success:function(e){var r=e.getFields(),a=[];Ext.Array.each(r,function(e){e.required&&!e.readOnly&&a.push(e.name)}),t.resolve(a)}}),t.promise},getSettingsFields:function(){return[{name:"portfolioitem",xtype:"rallyfieldpicker",autoExpand:!0,alwaysExpanded:!1,modelTypes:["PortfolioItem/Feature"],margin:"10px 0 10px 0",fieldLabel:"Feature Fields",_shouldShowField:function(e){var t=e.attributeDefinition;return t&&!t.ReadOnly&&"COLLECTION"!==t.AttributeType},listeners:{ready:function(e){e.collapse()}},readyEvent:"ready"},{name:"hierarchicalrequirement",xtype:"rallyfieldpicker",autoExpand:!0,alwaysExpanded:!1,modelTypes:["HierarchicalRequirement"],margin:"10px 0 10px 0",fieldLabel:"Story Fields",_shouldShowField:function(e){var t=e.attributeDefinition;return t&&!t.ReadOnly&&"COLLECTION"!==t.AttributeType},listeners:{ready:function(e){e.collapse()}},readyEvent:"ready"},{name:"task",xtype:"rallyfieldpicker",autoExpand:!0,alwaysExpanded:!1,modelTypes:["Task"],margin:"10px 0 200px 0",fieldLabel:"Task Fields",_shouldShowField:function(e){var t=e.attributeDefinition;return t&&!t.ReadOnly&&"COLLECTION"!==t.AttributeType},listeners:{ready:function(e){e.collapse()}},readyEvent:"ready"}]},isExternal:function(){return void 0===this.getAppId()},onSettingsUpdate:function(e){console.log("onSettingsUpdate",e),Ext.apply(this,e),this.launch()}});
+                var app=null;Ext.define("CustomApp",{extend:"Rally.app.App",componentCls:"app",layout:{type:"table",columns:2},config:{defaultSettings:{portfolioitem:[""],hierarchicalrequirement:["ScheduleState","PlanEstimate"],task:["State","Estimate","TaskIndex","ToDo","Actuals"],preserve_rank:!0}},items:[{xtype:"label",text:"Copy To Project:",padding:"5px"},{id:"project-picker",xtype:"rallyprojectpicker",margin:"5px",model:"Project",field:"Name"},{xtype:"rallybutton",text:"Select Portfolio Item",margin:"5px",handler:function(){app.chooseItem()}},{id:"item-label",xtype:"label",margin:5,style:"font-weight:bold;",text:""},{itemId:"release-label",xtype:"label",padding:5,text:""},{itemId:"release-chooser",xtype:"container",margin:5},{id:"copy-button",xtype:"rallybutton",text:"Copy",margin:"5px",disabled:!0,handler:function(){app.performCopy()}},{id:"summary",xtype:"label",margin:"5px",style:"font-weight:bold;",text:""}],launch:function(){app=this;var e={portfolioitem:this.getSetting("portfolioitem"),hierarchicalrequirement:this.getSetting("hierarchicalrequirement"),task:this.getSetting("task")};Ext.isEmpty(e.portfolioitem)||Ext.isArray(e.portfolioitem)||(e.portfolioitem=e.portfolioitem.split(",")),Ext.isEmpty(e.hierarchicalrequirement)||Ext.isArray(e.hierarchicalrequirement)||(e.hierarchicalrequirement=e.hierarchicalrequirement.split(",")),Ext.isEmpty(e.task)||Ext.isArray(e.task)||(e.task=e.task.split(",")),app.fieldsToCopy=e,this._getRequiredFields().then({scope:this,success:function(e){app.requiredFields=e,_.each(_.keys(app.fieldsToCopy),function(t){app.fieldsToCopy[t]=_.uniq(app.fieldsToCopy[t].concat(e[t]))}),Ext.Array.contains(e.hierarchicalrequirement,"Release")&&(this.down("#release-label").setText("Default Release:"),this.down("#release-chooser").removeAll(),this.down("#release-chooser").add({xtype:"rallyreleasecombobox",showArrows:!1}))}})},chooseItem:function(){Ext.create("Rally.ui.dialog.ArtifactChooserDialog",{artifactTypes:["PortfolioItem"],autoShow:!0,_isArtifactEditable:function(e){return!0},title:"Choose Item",listeners:{artifactChosen:function(e,t){this.down("#item-label").setText(t.get("FormattedID")+" - "+t.get("Name")),this.down("#copy-button").setDisabled(!0),app.itemSelected(t)},scope:this}})},itemSelected:function(e){app.setLoading("Analyzing hierarchy...");var t={model:"PortfolioItem",fetch:!0,filters:[{property:"ObjectID",operator:"=",value:e.get("ObjectID")}]};async.map([t],app.wsapiQuery,function(e,t){var r=t[0][0];app.list=[],async.map([r],app.createList,function(e,t){app.models={},app.types=_.uniq(_.map(app.list,function(e){return e.get("_type")})),async.mapSeries(app.types,app.loadModel,function(e,t){_.each(app.types,function(e,r){app.models[e]=t[r]}),app.down("#summary").setText(app.list.length+" Items to be copied");var r=app.down("#project-picker").getValue();null!==r&&""!==r&&app.down("#copy-button").setDisabled(!1),app.setLoading(!1)})})})},performCopy:function(){app.copyList={},app.projectRef=app.down("#project-picker").getValue(),async.mapSeries(app.list,app.copyItem,function(e,t){null===e?app.down("#summary").setText(t.length+" Items copied to "+t[0].get("FormattedID")):app.down("#summary").setText(e,!1)})},copyItem:function(e,t){var r={Name:e.get("Name"),Workspace:e.get("Workspace")._ref,Description:e.get("Description"),Owner:null!==e.get("Owner")?e.get("Owner")._ref:null,DisplayColor:_.isNull(e.get("DisplayColor"))||_.isUndefined(e.get("DisplayColor"))?null:e.get("DisplayColor")};r=app.copyTypeSpecificFields(r,e);var a=app.parentRef(e);if(null!==a){var i=app.copyList[a.ref];_.isUndefined(i)||(r[a.type]=i)}var o=app.models[e.get("_type")];async.map([{model:o,copy:r,source:e}],app.createItem,function(e,r){_.isUndefined(e)||_.isNull(e)?t(null,r[0]):t(e,null)})},copyTypeSpecificFields:function(e,t){var r=-1!==t.get("_type").toLowerCase().indexOf("portfolioitem")?"portfolioitem":t.get("_type");if(reference_fields=["Release","Iteration","Owner"],Ext.Array.each(this.fieldsToCopy[r],function(r){var a=this._getRelease(t);"FlowState"===r?Rally.util.Ref.getRelativeUri(t.get("Project"))===app.projectRef&&(e[r]=Rally.util.Ref.getRelativeUri(t.get("FlowState"))):!Ext.isEmpty(a)&&Ext.Array.contains(reference_fields,r)?e[r]={_ref:a._ref}:e[r]=t.get(r)},this),t.get("Tags").Count>0){var a=_.map(t.get("Tags")._tagsNameArray,function(e){return{_ref:e._ref}});e.Tags=a}return e},_getRelease:function(e){var t=e.get("Release");return Ext.isEmpty(t)&&this.down("rallyreleasecombobox")&&(t=this.down("rallyreleasecombobox").getRecord().getData()),t},createItem:function(e,t){var r=Ext.create(e.model,e.copy);r.set("Project",app.projectRef),r.save({callback:function(r,a){if(!0===a.success)app.copyList[e.source.get("_ref")]=r.get("_ref"),app.down("#summary").setText("("+_.keys(app.copyList).length+" of "+app.list.length+"): Created "+r.get("FormattedID")+" - "+r.get("Name")),t(null,r);else{console.log("Error:",a);var i="<span class='icon-warning'> </span>Create Error when copying "+e.copy.Name;Ext.isEmpty(a.error)||Ext.isEmpty(a.error.errors)||(i+=":<br/>"+a.error.errors.join("<br/>")),t(i,null)}}})},readCollection:function(e,t){var r=Rally.data.Ranker.getRankField(e.reference),a=e.direction;e.reference.getCollection(e.type,{fetch:!0,sorters:[{property:r,direction:a}]}).load({fetch:!0,callback:function(e,r,a){t(null,e)}})},createList:function(e,t){var r={model:e.raw._type,fetch:!0,filters:[{property:"ObjectID",operator:"=",value:e.get("ObjectID")}]};async.map([r],wsapiQuery,function(r,a){var i=a[0][0],o="DESC";app.list.push(i);var n=null;if(app.defined(i.get("Tasks"))?(n="Tasks",o="DESC"):app.defined(i.get("Children"))?(n="Children",/PortfolioItem/.test(e.raw._type)&&(o="ASC")):app.defined(i.get("UserStories"))&&(n="UserStories"),app.isObject(n)){var l={reference:i,type:n,direction:o};app.getSetting("preserve_rank")&&"false"!=app.getSetting("preserve_rank")?async.mapSeries([l],app.readCollection,function(e,r){var a=r[0];async.mapSeries(a,app.createList,function(e,r){t(null,r)})}):async.map([l],app.readCollection,function(e,r){var a=r[0];async.map(a,app.createList,function(e,r){t(null,r)})})}else t(null,i)})},parentRef:function(e){return _.isObject(e.get("Parent"))?{type:"Parent",ref:e.get("Parent")._ref}:_.isObject(e.get("WorkProduct"))?{type:"WorkProduct",ref:e.get("WorkProduct")._ref}:_.isObject(e.get("PortfolioItem"))?{type:"PortfolioItem",ref:e.get("PortfolioItem")._ref}:null},loadModel:function(e,t){Rally.data.ModelFactory.getModel({type:e,success:function(e){t(null,e)}})},isObject:function(e){return!_.isUndefined(e)&&!_.isNull(e)},defined:function(e){return app.isObject(e)&&e.Count>0},wsapiQuery:function(e,t){Ext.create("Rally.data.WsapiDataStore",{autoLoad:!0,context:{project:null,workspace:app.getContext().getWorkspaceRef()},limit:"Infinity",model:e.model,fetch:e.fetch,filters:e.filters,sorters:e.sorters,listeners:{scope:this,load:function(e,r){t(null,r)}}})},_getRequiredFields:function(){var e=Ext.create("Deft.Deferred");return Deft.Promise.all([this._getRequiredFieldsForModel("portfolioitem"),this._getRequiredFieldsForModel("hierarchicalrequirement"),this._getRequiredFieldsForModel("task")]).then({scope:this,success:function(t){e.resolve({portfolioitem:t[0],hierarchicalrequirement:t[1],task:t[2]})}}),e.promise},_getRequiredFieldsForModel:function(e){var t=Ext.create("Deft.Deferred");return Rally.data.ModelFactory.getModel({type:e,success:function(e){var r=e.getFields(),a=[];Ext.Array.each(r,function(e){e.required&&!e.readOnly&&a.push(e.name)}),t.resolve(a)}}),t.promise},getSettingsFields:function(){return[{name:"preserve_rank",xtype:"rallycheckboxfield",margin:"10px 0 10px 0",fieldLabel:"Maintain Ranks"},{name:"portfolioitem",xtype:"rallyfieldpicker",autoExpand:!0,alwaysExpanded:!1,modelTypes:["PortfolioItem"],margin:"10px 0 10px 0",fieldLabel:"Portfolio Item Fields",_shouldShowField:function(e){var t=e.attributeDefinition;return t&&!t.ReadOnly&&"COLLECTION"!==t.AttributeType},listeners:{ready:function(e){e.collapse()}},readyEvent:"ready"},{name:"hierarchicalrequirement",xtype:"rallyfieldpicker",autoExpand:!0,alwaysExpanded:!1,modelTypes:["HierarchicalRequirement"],margin:"10px 0 10px 0",fieldLabel:"Story Fields",_shouldShowField:function(e){var t=e.attributeDefinition;return t&&!t.ReadOnly&&"COLLECTION"!==t.AttributeType},listeners:{ready:function(e){e.collapse()}},readyEvent:"ready"},{name:"task",xtype:"rallyfieldpicker",autoExpand:!0,alwaysExpanded:!1,modelTypes:["Task"],margin:"10px 0 200px 0",fieldLabel:"Task Fields",_shouldShowField:function(e){var t=e.attributeDefinition;return t&&!t.ReadOnly&&"COLLECTION"!==t.AttributeType},listeners:{ready:function(e){e.collapse()}},readyEvent:"ready"}]},isExternal:function(){return void 0===this.getAppId()},onSettingsUpdate:function(e){console.log("onSettingsUpdate",e),Ext.apply(this,e),this.launch()}});
                 function getReleaseTimeBox(t){var e=t.getContext().getTimeboxScope(),n=null;e?n=e.getRecord().get("Name"):n="";return n}function wsapiQuery(t,e){Ext.create("Rally.data.WsapiDataStore",{autoLoad:!0,limit:"Infinity",context:{project:null,workspace:Rally.environment.getContext().getWorkspaceRef()},model:t.model,fetch:t.fetch,filters:t.filters,listeners:{scope:this,load:function(t,n){e(null,n)}}})}function snapshotQuery(t,e){var n={find:t.find,fetch:t.fetch,hydrate:t.hydrate,autoLoad:!0,pageSize:1e4,limit:"Infinity",listeners:{scope:this,load:function(t,n,o){console.log("snapshots:",n.length),e(null,n)}}};Ext.create("Rally.data.lookback.SnapshotStore",n)}function pointsUnitType(t){return"Points"==t}
 
             Rally.launchApp('CustomApp', {
                 name:"portfolio-item-copy",
                 parentRepos:"",
-                version:"1.0.1"
+                version:"1.0.2"
             });
 
         });
diff --git a/images/screenshot.png b/images/screenshot.png
new file mode 100644
index 0000000..9af4a58
Binary files /dev/null and b/images/screenshot.png differ
diff --git a/images/settings.png b/images/settings.png
new file mode 100644
index 0000000..126dc08
Binary files /dev/null and b/images/settings.png differ
diff --git a/package.json b/package.json
index fd77caa..2bf4ba0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "portfolio-item-copy",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "private": true,
   "devDependencies": {
       "grunt": "~0.4.1",
diff --git a/screenshot.png b/screenshot.png
deleted file mode 100644
index 464f367..0000000
Binary files a/screenshot.png and /dev/null differ