From e725a33a6eab0cb7b2db19252a9771ce0e2a325a Mon Sep 17 00:00:00 2001
From: "jdc@princeton.edu" <jdc@princeton.edu>
Date: Sat, 4 Nov 2017 08:22:39 -0400
Subject: [PATCH 1/6] -

---
 .idea/runConfigurations/AGT_Test_Script.xml                     | 2 +-
 .idea/runConfigurations/DDM_Learning_Test.xml                   | 2 +-
 .idea/runConfigurations/EVC_Gratton_Script___SEBASTIAN.xml      | 2 +-
 .../EVC_System_Laming_Validation_Test_Script_DEBUGGING.xml      | 2 +-
 ..._Laming_Validation_Test_Script__SPECIFY_ControlSignals__.xml | 2 +-
 .../EVC_System_Laming_Validation_Test_Script_with_Custom_Fn.xml | 2 +-
 .../runConfigurations/EVC_System_Test_Script_with_Profiler.xml  | 2 +-
 .idea/runConfigurations/FinalProject.xml                        | 2 +-
 .idea/runConfigurations/Gating_Mechanism_Test_Script.xml        | 2 +-
 .idea/runConfigurations/GilzenratModel.xml                      | 2 +-
 .idea/runConfigurations/Make_HTML.xml                           | 2 +-
 .../Multilayer_Learning_Test_Script_VARIATIONS.xml              | 2 +-
 .../Multilayer_Learning_Test_Script__WITH_GATING_.xml           | 2 +-
 .idea/runConfigurations/NEW_Learning_Markus.xml                 | 2 +-
 .idea/runConfigurations/NetworkX_Examples.xml                   | 2 +-
 .idea/runConfigurations/Profile_EVC_System_Test.xml             | 2 +-
 .../Stroop_Model_Learning_and_Control_Test_Script.xml           | 2 +-
 .idea/runConfigurations/Stroop_Model_Test_Script_VARIATIONS.xml | 2 +-
 .idea/runConfigurations/Two_Layer_Test_Script.xml               | 2 +-
 .idea/runConfigurations/Xor_Script_1_process_working.xml        | 2 +-
 .idea/runConfigurations/Xor_Script_2_processes.xml              | 2 +-
 .idea/runConfigurations/_DDM_Test_Script.xml                    | 2 +-
 .idea/runConfigurations/_DDM_scheduled_simple.xml               | 2 +-
 .idea/runConfigurations/_Documentation_Examples.xml             | 2 +-
 .idea/runConfigurations/_EVC_System_DEMO_Script.xml             | 2 +-
 .../_EVC_System_Laming_Validation_Test_Script.xml               | 2 +-
 .idea/runConfigurations/_Integrator_scheduled_timescales.xml    | 2 +-
 .idea/runConfigurations/_META_TEST.xml                          | 2 +-
 .idea/runConfigurations/_Mixed_NN___DDM_DEMO_Script.xml         | 2 +-
 .idea/runConfigurations/_Mixed_Neural_Network_and_DDM.xml       | 2 +-
 .idea/runConfigurations/_Multilayer_Learning_Test_Script.xml    | 2 +-
 .../runConfigurations/_Multilayer_Learning_Test_Script_DEMO.xml | 2 +-
 .idea/runConfigurations/_Reinforcement_Learning_Test_Script.xml | 2 +-
 .idea/runConfigurations/_Scratch_Pad.xml                        | 2 +-
 .idea/runConfigurations/_Stroop_Demo_Script.xml                 | 2 +-
 .idea/runConfigurations/_Stroop_Model_Learning_Test_Script.xml  | 2 +-
 .idea/runConfigurations/_Stroop_Model_Test.xml                  | 2 +-
 .idea/runConfigurations/_System_Graph_and_Input_Test.xml        | 2 +-
 .idea/runConfigurations/_System_Learning_Test_Script.xml        | 2 +-
 .idea/runConfigurations/make_html_and_ghpages_py.xml            | 2 +-
 .idea/runConfigurations/test_system.xml                         | 2 +-
 .idea/runConfigurations/topo_example.xml                        | 2 +-
 42 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/.idea/runConfigurations/AGT_Test_Script.xml b/.idea/runConfigurations/AGT_Test_Script.xml
index e8d443a835e..78d22b8a0b4 100644
--- a/.idea/runConfigurations/AGT_Test_Script.xml
+++ b/.idea/runConfigurations/AGT_Test_Script.xml
@@ -10,7 +10,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/DEBUGGING SCRIPTS/AGT Test Script.py" />
     <option name="PARAMETERS" value="" />
     <option name="SHOW_COMMAND_LINE" value="false" />
diff --git a/.idea/runConfigurations/DDM_Learning_Test.xml b/.idea/runConfigurations/DDM_Learning_Test.xml
index 1830c04f79a..953e3a60d1f 100644
--- a/.idea/runConfigurations/DDM_Learning_Test.xml
+++ b/.idea/runConfigurations/DDM_Learning_Test.xml
@@ -10,7 +10,7 @@
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/MISCELLANEOUS SCRIPTS/TEST SCRIPTS/DDM Learning Test Script.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/EVC_Gratton_Script___SEBASTIAN.xml b/.idea/runConfigurations/EVC_Gratton_Script___SEBASTIAN.xml
index d5ebe06c98c..fc05b0da0c2 100644
--- a/.idea/runConfigurations/EVC_Gratton_Script___SEBASTIAN.xml
+++ b/.idea/runConfigurations/EVC_Gratton_Script___SEBASTIAN.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/DEBUGGING SCRIPTS/EVC Gratton Script - SEBASTIAN.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/EVC_System_Laming_Validation_Test_Script_DEBUGGING.xml b/.idea/runConfigurations/EVC_System_Laming_Validation_Test_Script_DEBUGGING.xml
index 068f6e70c3c..f4ef35dca3a 100644
--- a/.idea/runConfigurations/EVC_System_Laming_Validation_Test_Script_DEBUGGING.xml
+++ b/.idea/runConfigurations/EVC_System_Laming_Validation_Test_Script_DEBUGGING.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/DEBUGGING SCRIPTS/EVC System Laming Validation Test Script DEBUGGING.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/EVC_System_Laming_Validation_Test_Script__SPECIFY_ControlSignals__.xml b/.idea/runConfigurations/EVC_System_Laming_Validation_Test_Script__SPECIFY_ControlSignals__.xml
index 22c4216d7c7..60a334dc9c6 100644
--- a/.idea/runConfigurations/EVC_System_Laming_Validation_Test_Script__SPECIFY_ControlSignals__.xml
+++ b/.idea/runConfigurations/EVC_System_Laming_Validation_Test_Script__SPECIFY_ControlSignals__.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/DEBUGGING SCRIPTS/EVC System Laming Validation Test Script [SPECIFY ControlSignals]].py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/EVC_System_Laming_Validation_Test_Script_with_Custom_Fn.xml b/.idea/runConfigurations/EVC_System_Laming_Validation_Test_Script_with_Custom_Fn.xml
index 29683d7ef3e..eda21b9d569 100644
--- a/.idea/runConfigurations/EVC_System_Laming_Validation_Test_Script_with_Custom_Fn.xml
+++ b/.idea/runConfigurations/EVC_System_Laming_Validation_Test_Script_with_Custom_Fn.xml
@@ -10,7 +10,7 @@
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/MISCELLANEOUS SCRIPTS/EVC System Laming Validation Test Script with Custom Fn.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/EVC_System_Test_Script_with_Profiler.xml b/.idea/runConfigurations/EVC_System_Test_Script_with_Profiler.xml
index a132b8e24fa..10159fb830b 100644
--- a/.idea/runConfigurations/EVC_System_Test_Script_with_Profiler.xml
+++ b/.idea/runConfigurations/EVC_System_Test_Script_with_Profiler.xml
@@ -10,7 +10,7 @@
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/MISCELLANEOUS SCRIPTS/EVC System Test Script with Profiler.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/FinalProject.xml b/.idea/runConfigurations/FinalProject.xml
index e14524de681..359470a52bc 100644
--- a/.idea/runConfigurations/FinalProject.xml
+++ b/.idea/runConfigurations/FinalProject.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/STUDENT SCRIPTS/FinalProject.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/Gating_Mechanism_Test_Script.xml b/.idea/runConfigurations/Gating_Mechanism_Test_Script.xml
index 4cb9af1519a..c229c054d49 100644
--- a/.idea/runConfigurations/Gating_Mechanism_Test_Script.xml
+++ b/.idea/runConfigurations/Gating_Mechanism_Test_Script.xml
@@ -10,7 +10,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/TEST SCRIPTS/Gating Mechanism Test Script.py" />
     <option name="PARAMETERS" value="" />
     <option name="SHOW_COMMAND_LINE" value="false" />
diff --git a/.idea/runConfigurations/GilzenratModel.xml b/.idea/runConfigurations/GilzenratModel.xml
index 551bfb71abb..0a4febeba4c 100644
--- a/.idea/runConfigurations/GilzenratModel.xml
+++ b/.idea/runConfigurations/GilzenratModel.xml
@@ -10,7 +10,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/Models/GilzenratModel.py" />
     <option name="PARAMETERS" value="" />
     <option name="SHOW_COMMAND_LINE" value="false" />
diff --git a/.idea/runConfigurations/Make_HTML.xml b/.idea/runConfigurations/Make_HTML.xml
index 273f929bfe6..5bb9d2dc53a 100644
--- a/.idea/runConfigurations/Make_HTML.xml
+++ b/.idea/runConfigurations/Make_HTML.xml
@@ -8,7 +8,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="docutils_input_file" value="$PROJECT_DIR$/docs/source" />
     <option name="docutils_output_file" value="$PROJECT_DIR$/docs/build/html" />
diff --git a/.idea/runConfigurations/Multilayer_Learning_Test_Script_VARIATIONS.xml b/.idea/runConfigurations/Multilayer_Learning_Test_Script_VARIATIONS.xml
index 71e33c5b672..a3a9182bb4b 100644
--- a/.idea/runConfigurations/Multilayer_Learning_Test_Script_VARIATIONS.xml
+++ b/.idea/runConfigurations/Multilayer_Learning_Test_Script_VARIATIONS.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/DEBUGGING SCRIPTS/Multilayer Learning Test Script VARIATIONS.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/Multilayer_Learning_Test_Script__WITH_GATING_.xml b/.idea/runConfigurations/Multilayer_Learning_Test_Script__WITH_GATING_.xml
index 04e08d34a15..77d1c734a67 100644
--- a/.idea/runConfigurations/Multilayer_Learning_Test_Script__WITH_GATING_.xml
+++ b/.idea/runConfigurations/Multilayer_Learning_Test_Script__WITH_GATING_.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/DEBUGGING SCRIPTS/Multilayer Learning Test Script [WITH GATING].py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/NEW_Learning_Markus.xml b/.idea/runConfigurations/NEW_Learning_Markus.xml
index d2e7bece107..86d88ccf993 100644
--- a/.idea/runConfigurations/NEW_Learning_Markus.xml
+++ b/.idea/runConfigurations/NEW_Learning_Markus.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/DEMO SCRIPTS/NEW_Learning_Markus.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/NetworkX_Examples.xml b/.idea/runConfigurations/NetworkX_Examples.xml
index df2774f8a56..91210ca7522 100644
--- a/.idea/runConfigurations/NetworkX_Examples.xml
+++ b/.idea/runConfigurations/NetworkX_Examples.xml
@@ -10,7 +10,7 @@
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/PsyNeuLink/Globals/NetworkX tesst.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/Profile_EVC_System_Test.xml b/.idea/runConfigurations/Profile_EVC_System_Test.xml
index 13365fb7733..1016f59da8b 100644
--- a/.idea/runConfigurations/Profile_EVC_System_Test.xml
+++ b/.idea/runConfigurations/Profile_EVC_System_Test.xml
@@ -10,7 +10,7 @@
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/MISCELLANEOUS SCRIPTS/Profile EVC System Test Script.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/Stroop_Model_Learning_and_Control_Test_Script.xml b/.idea/runConfigurations/Stroop_Model_Learning_and_Control_Test_Script.xml
index d110cc35e81..f376af157cc 100644
--- a/.idea/runConfigurations/Stroop_Model_Learning_and_Control_Test_Script.xml
+++ b/.idea/runConfigurations/Stroop_Model_Learning_and_Control_Test_Script.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/TEST SCRIPTS/Stroop Model Learning and Control Test Script.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/Stroop_Model_Test_Script_VARIATIONS.xml b/.idea/runConfigurations/Stroop_Model_Test_Script_VARIATIONS.xml
index d3886cc032f..41386758f1d 100644
--- a/.idea/runConfigurations/Stroop_Model_Test_Script_VARIATIONS.xml
+++ b/.idea/runConfigurations/Stroop_Model_Test_Script_VARIATIONS.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/DEBUGGING SCRIPTS/Stroop Model Test Script VARIATIONS.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/Two_Layer_Test_Script.xml b/.idea/runConfigurations/Two_Layer_Test_Script.xml
index e5dd04359a9..4fac001f902 100644
--- a/.idea/runConfigurations/Two_Layer_Test_Script.xml
+++ b/.idea/runConfigurations/Two_Layer_Test_Script.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/MISCELLANEOUS SCRIPTS/Two Layer Test Script.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/Xor_Script_1_process_working.xml b/.idea/runConfigurations/Xor_Script_1_process_working.xml
index 9c86080c6e5..462fab831a2 100644
--- a/.idea/runConfigurations/Xor_Script_1_process_working.xml
+++ b/.idea/runConfigurations/Xor_Script_1_process_working.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/DEMO SCRIPTS/Xor_Script_Working.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/Xor_Script_2_processes.xml b/.idea/runConfigurations/Xor_Script_2_processes.xml
index a4372c37cc6..5d5d714b893 100644
--- a/.idea/runConfigurations/Xor_Script_2_processes.xml
+++ b/.idea/runConfigurations/Xor_Script_2_processes.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/DEMO SCRIPTS/Xor_Script_2_processes.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/_DDM_Test_Script.xml b/.idea/runConfigurations/_DDM_Test_Script.xml
index a07730b20c8..7611a378b2e 100644
--- a/.idea/runConfigurations/_DDM_Test_Script.xml
+++ b/.idea/runConfigurations/_DDM_Test_Script.xml
@@ -10,7 +10,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/TEST SCRIPTS/DDM Test Script.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/_DDM_scheduled_simple.xml b/.idea/runConfigurations/_DDM_scheduled_simple.xml
index db8dfd99dc2..70a8845cd74 100644
--- a/.idea/runConfigurations/_DDM_scheduled_simple.xml
+++ b/.idea/runConfigurations/_DDM_scheduled_simple.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/DEMO SCRIPTS/DDM_scheduled_simple.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/_Documentation_Examples.xml b/.idea/runConfigurations/_Documentation_Examples.xml
index 021c739c153..c50b0e61c51 100644
--- a/.idea/runConfigurations/_Documentation_Examples.xml
+++ b/.idea/runConfigurations/_Documentation_Examples.xml
@@ -10,7 +10,7 @@
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/TEST SCRIPTS/Documentation Examples Script.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/_EVC_System_DEMO_Script.xml b/.idea/runConfigurations/_EVC_System_DEMO_Script.xml
index 5d2f7244c7c..b116789eb36 100644
--- a/.idea/runConfigurations/_EVC_System_DEMO_Script.xml
+++ b/.idea/runConfigurations/_EVC_System_DEMO_Script.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/DEMO SCRIPTS/• EVC System DEMO Script.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/_EVC_System_Laming_Validation_Test_Script.xml b/.idea/runConfigurations/_EVC_System_Laming_Validation_Test_Script.xml
index 8f52a8aa544..fcd9608fd0b 100644
--- a/.idea/runConfigurations/_EVC_System_Laming_Validation_Test_Script.xml
+++ b/.idea/runConfigurations/_EVC_System_Laming_Validation_Test_Script.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/TEST SCRIPTS/EVC System Laming Validation Test Script.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/_Integrator_scheduled_timescales.xml b/.idea/runConfigurations/_Integrator_scheduled_timescales.xml
index e8bc21786ce..f8eb4f8b27f 100644
--- a/.idea/runConfigurations/_Integrator_scheduled_timescales.xml
+++ b/.idea/runConfigurations/_Integrator_scheduled_timescales.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/DEMO SCRIPTS/Integrator_scheduled_timescales.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/_META_TEST.xml b/.idea/runConfigurations/_META_TEST.xml
index bae196ffa6f..ee5da1f19b9 100644
--- a/.idea/runConfigurations/_META_TEST.xml
+++ b/.idea/runConfigurations/_META_TEST.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/TEST SCRIPTS/META Test Script.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/_Mixed_NN___DDM_DEMO_Script.xml b/.idea/runConfigurations/_Mixed_NN___DDM_DEMO_Script.xml
index fcc62c27e0e..fd0b6ec987a 100644
--- a/.idea/runConfigurations/_Mixed_NN___DDM_DEMO_Script.xml
+++ b/.idea/runConfigurations/_Mixed_NN___DDM_DEMO_Script.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/DEMO SCRIPTS/• Mixed NN &amp; DDM DEMO Script.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/_Mixed_Neural_Network_and_DDM.xml b/.idea/runConfigurations/_Mixed_Neural_Network_and_DDM.xml
index e349065887c..f795122c488 100644
--- a/.idea/runConfigurations/_Mixed_Neural_Network_and_DDM.xml
+++ b/.idea/runConfigurations/_Mixed_Neural_Network_and_DDM.xml
@@ -10,7 +10,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/TEST SCRIPTS/Mixed NN &amp; DDM script.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/_Multilayer_Learning_Test_Script.xml b/.idea/runConfigurations/_Multilayer_Learning_Test_Script.xml
index 9f3bdb80361..c3614ce284e 100644
--- a/.idea/runConfigurations/_Multilayer_Learning_Test_Script.xml
+++ b/.idea/runConfigurations/_Multilayer_Learning_Test_Script.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/TEST SCRIPTS/Multilayer Learning Test Script.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/_Multilayer_Learning_Test_Script_DEMO.xml b/.idea/runConfigurations/_Multilayer_Learning_Test_Script_DEMO.xml
index 7664f86ca9c..d01b747a1aa 100644
--- a/.idea/runConfigurations/_Multilayer_Learning_Test_Script_DEMO.xml
+++ b/.idea/runConfigurations/_Multilayer_Learning_Test_Script_DEMO.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/DEMO SCRIPTS/• Multilayer Learning Test Script DEMO.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/_Reinforcement_Learning_Test_Script.xml b/.idea/runConfigurations/_Reinforcement_Learning_Test_Script.xml
index 3b5775ad30b..430d9fd183d 100644
--- a/.idea/runConfigurations/_Reinforcement_Learning_Test_Script.xml
+++ b/.idea/runConfigurations/_Reinforcement_Learning_Test_Script.xml
@@ -10,7 +10,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/TEST SCRIPTS/Reinforcement Learning Test Script.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/_Scratch_Pad.xml b/.idea/runConfigurations/_Scratch_Pad.xml
index cb1de20263c..13bfa32a9c8 100644
--- a/.idea/runConfigurations/_Scratch_Pad.xml
+++ b/.idea/runConfigurations/_Scratch_Pad.xml
@@ -10,7 +10,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/Scratch Pad.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/_Stroop_Demo_Script.xml b/.idea/runConfigurations/_Stroop_Demo_Script.xml
index 69554f0ec22..b2017ea4204 100644
--- a/.idea/runConfigurations/_Stroop_Demo_Script.xml
+++ b/.idea/runConfigurations/_Stroop_Demo_Script.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/DEMO SCRIPTS/Stroop Demo Script.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/_Stroop_Model_Learning_Test_Script.xml b/.idea/runConfigurations/_Stroop_Model_Learning_Test_Script.xml
index 6ad30dcbae8..669f716e256 100644
--- a/.idea/runConfigurations/_Stroop_Model_Learning_Test_Script.xml
+++ b/.idea/runConfigurations/_Stroop_Model_Learning_Test_Script.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/TEST SCRIPTS/Stroop Model Learning Test Script.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/_Stroop_Model_Test.xml b/.idea/runConfigurations/_Stroop_Model_Test.xml
index 710857aec7b..86d586ed263 100644
--- a/.idea/runConfigurations/_Stroop_Model_Test.xml
+++ b/.idea/runConfigurations/_Stroop_Model_Test.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/TEST SCRIPTS/Stroop Model Test Script.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/_System_Graph_and_Input_Test.xml b/.idea/runConfigurations/_System_Graph_and_Input_Test.xml
index 060d51af7cc..de08911f03b 100644
--- a/.idea/runConfigurations/_System_Graph_and_Input_Test.xml
+++ b/.idea/runConfigurations/_System_Graph_and_Input_Test.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/TEST SCRIPTS/System Graph and Input Test Script.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/_System_Learning_Test_Script.xml b/.idea/runConfigurations/_System_Learning_Test_Script.xml
index f53d89841bb..ddfae0edc63 100644
--- a/.idea/runConfigurations/_System_Learning_Test_Script.xml
+++ b/.idea/runConfigurations/_System_Learning_Test_Script.xml
@@ -10,7 +10,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Scripts/MISCELLANEOUS SCRIPTS/System Learning Test Script.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/make_html_and_ghpages_py.xml b/.idea/runConfigurations/make_html_and_ghpages_py.xml
index bef143ce0ac..e7e43e27492 100644
--- a/.idea/runConfigurations/make_html_and_ghpages_py.xml
+++ b/.idea/runConfigurations/make_html_and_ghpages_py.xml
@@ -10,7 +10,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/bin/make_html_and_ghpages.py" />
     <option name="PARAMETERS" value="--orgpush" />
diff --git a/.idea/runConfigurations/test_system.xml b/.idea/runConfigurations/test_system.xml
index 0442de18fd8..e1ee9ba5f1f 100644
--- a/.idea/runConfigurations/test_system.xml
+++ b/.idea/runConfigurations/test_system.xml
@@ -11,7 +11,7 @@
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tests/system/test_system.py" />
     <option name="PARAMETERS" value="" />
diff --git a/.idea/runConfigurations/topo_example.xml b/.idea/runConfigurations/topo_example.xml
index 98674565da0..dd4f4fcce34 100644
--- a/.idea/runConfigurations/topo_example.xml
+++ b/.idea/runConfigurations/topo_example.xml
@@ -10,7 +10,7 @@
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="PsyNeuLink" />
+    <module name="PsyNeuLink (Dropbox)" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" sample_coverage="true" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/PsyNeuLink/Globals/toposort/topo_example.py" />
     <option name="PARAMETERS" value="" />

From 0c24e98a96698260f54f26552de5c916f5ba250a Mon Sep 17 00:00:00 2001
From: "jdc@princeton.edu" <jdc@princeton.edu>
Date: Wed, 8 Nov 2017 20:38:16 -0500
Subject: [PATCH 2/6] Merge branch 'devel' of
 https://github.com/PrincetonUniversity/PsyNeuLink into CURRENT

# Conflicts:
#	tests/mechanisms/test_transfer_mechanism.py
---
 Scripts/Scratch Pad.py                        | 20 +++++++++++++
 psyneulink/components/mechanisms/mechanism.py | 29 ++++++++++++++-----
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/Scripts/Scratch Pad.py b/Scripts/Scratch Pad.py
index 61b98c24e5d..ae9f311bf0f 100644
--- a/Scripts/Scratch Pad.py	
+++ b/Scripts/Scratch Pad.py	
@@ -411,6 +411,26 @@ def __init__(self, error_value):
 # for projection in my_mech.output_states[0].efferents:
 #     print(projection.name)
 
+# FROM KEVIN: -------------------------------------
+
+# WORKING:
+I = pnl.InputState(reference_value=[0,0,0])
+pnl.TransferMechanism(input_states=[I])
+
+#-------------
+# m = pnl.TransferMechanism()
+# i = pnl.InputState(owner=m, reference_value=[0, 0, 0])
+
+# m = pnl.TransferMechanism(default_variable=[0, 0, 0])
+# i = pnl.InputState(owner=m, reference_value=[0, 0, 0])
+
+# p = pnl.MappingProjection()
+# T = pnl.TransferMechanism(input_states=[{pnl.VARIABLE: [0, 0, 0], pnl.PROJECTIONS:[p]}])
+
+# p = pnl.MappingProjection()
+# T = pnl.TransferMechanism(default_variable=[0, 0], input_states=[p])
+
+# --------------------------------------------------------------------------------------------------
 
 # My_Transfer_Mech_A = TransferMechanism(
 #                            function=Logistic(
diff --git a/psyneulink/components/mechanisms/mechanism.py b/psyneulink/components/mechanisms/mechanism.py
index 88df442a152..8af3b57955a 100644
--- a/psyneulink/components/mechanisms/mechanism.py
+++ b/psyneulink/components/mechanisms/mechanism.py
@@ -707,12 +707,18 @@ class `UserList <https://docs.python.org/3.6/library/collections.html?highlight=
 import numpy as np
 import typecheck as tc
 
-from psyneulink.components.component import Component, ExecutionStatus, function_type, method_type
+from psyneulink.components.component import Component, InitStatus, ExecutionStatus, function_type, method_type
 from psyneulink.components.shellclasses import Function, Mechanism, Projection, State
 from psyneulink.components.states.inputstate import InputState
 from psyneulink.components.states.state import _parse_state_spec
 from psyneulink.globals.defaults import timeScaleSystemDefault
-from psyneulink.globals.keywords import CHANGED, COMMAND_LINE, EVC_SIMULATION, EXECUTING, FUNCTION_PARAMS, INITIALIZING, INIT_FUNCTION_METHOD_ONLY, INIT__EXECUTE__METHOD_ONLY, INPUT_STATES, INPUT_STATE_PARAMS, MECHANISM_TIME_SCALE, MONITOR_FOR_CONTROL, MONITOR_FOR_LEARNING, NO_CONTEXT, OUTPUT_STATES, OUTPUT_STATE_PARAMS, PARAMETER_STATE_PARAMS, PROCESS_INIT, SEPARATOR_BAR, SET_ATTRIBUTE, SYSTEM_INIT, TIME_SCALE, UNCHANGED, VALIDATE, VARIABLE, kwMechanismComponentCategory, kwMechanismExecuteFunction
+from psyneulink.globals.keywords import \
+    CHANGED, COMMAND_LINE, EVC_SIMULATION, EXECUTING, FUNCTION_PARAMS, \
+    INITIALIZING, INIT_FUNCTION_METHOD_ONLY, INIT__EXECUTE__METHOD_ONLY, \
+    INPUT_STATES, INPUT_STATE_PARAMS, MECHANISM_TIME_SCALE, MONITOR_FOR_CONTROL, MONITOR_FOR_LEARNING, \
+    NO_CONTEXT, OUTPUT_STATES, OUTPUT_STATE_PARAMS, PARAMETER_STATE_PARAMS, PROCESS_INIT, SEPARATOR_BAR, \
+    SET_ATTRIBUTE, SYSTEM_INIT, TIME_SCALE, UNCHANGED, VALIDATE, VARIABLE, VALUE, REFERENCE_VALUE, \
+    kwMechanismComponentCategory, kwMechanismExecuteFunction
 from psyneulink.globals.preferences.preferenceset import PreferenceLevel
 from psyneulink.globals.registry import register_category
 from psyneulink.globals.utilities import AutoNumber, ContentAddressableList, append_type_to_name, convert_to_np_array, iscompatible, kwCompatibilityNumeric
@@ -1280,11 +1286,20 @@ def _parse_arg_input_states(self, input_states):
                     except KeyError:
                         pass
                 elif isinstance(parsed_spec, (Projection, Mechanism, State)):
-                    try:
-                        variable = parsed_spec.value
-                    except AttributeError:
-                        variable = parsed_spec.instance_defaults.variable
-                else:
+                    if parsed_spec.init_status is InitStatus.DEFERRED_INITIALIZATION:
+                        args = parsed_spec.init_args
+                        if REFERENCE_VALUE in args:
+                            variable = args[REFERENCE_VALUE]
+                        elif VALUE in args:
+                            variable = args[VALUE]
+                        elif VARIABLE in args:
+                            variable = args[VARIABLE]
+                    else:
+                        try:
+                            variable = parsed_spec.value
+                        except AttributeError:
+                            variable = parsed_spec.instance_defaults.variable
+                    else:
                     variable = parsed_spec.instance_defaults.variable
 
                 if variable is None:

From 7b545b4414ad2bf3e3e44b7df9a33c6682fa480f Mon Sep 17 00:00:00 2001
From: "jdc@princeton.edu" <jdc@princeton.edu>
Date: Wed, 8 Nov 2017 20:39:09 -0500
Subject: [PATCH 3/6] Merge branch 'devel' of
 https://github.com/PrincetonUniversity/PsyNeuLink into CURRENT

# Conflicts:
#	tests/mechanisms/test_transfer_mechanism.py
---
 Scripts/Scratch Pad.py                        | 17 ++++++++---------
 psyneulink/components/mechanisms/mechanism.py |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Scripts/Scratch Pad.py b/Scripts/Scratch Pad.py
index ae9f311bf0f..dac279ad979 100644
--- a/Scripts/Scratch Pad.py	
+++ b/Scripts/Scratch Pad.py	
@@ -370,13 +370,12 @@ def __init__(self, error_value):
 # g = pnl.GatingMechanism(gating_signals=[{pnl.MECHANISM:m,
 #                                          pnl.NAME:pnl.DECISION_VARIABLE}])
 
-my_mech = pnl.TransferMechanism(default_variable=[[0],[0]])
-
-print(my_mech.input_states)
-
-print(my_mech.parameter_states)
-print(my_mech.output_states)
-
+# my_mech = pnl.TransferMechanism(default_variable=[[0],[0]])
+#
+# print(my_mech.input_states)
+#
+# print(my_mech.parameter_states)
+# print(my_mech.output_states)
 
 # mech_A = pnl.TransferMechanism(input_states=['MY INPUT'])
 # print(mech_A.input_states)
@@ -414,8 +413,8 @@ def __init__(self, error_value):
 # FROM KEVIN: -------------------------------------
 
 # WORKING:
-I = pnl.InputState(reference_value=[0,0,0])
-pnl.TransferMechanism(input_states=[I])
+# I = pnl.InputState(reference_value=[0,0,0])
+# pnl.TransferMechanism(input_states=[I])
 
 #-------------
 # m = pnl.TransferMechanism()
diff --git a/psyneulink/components/mechanisms/mechanism.py b/psyneulink/components/mechanisms/mechanism.py
index 8af3b57955a..4153d7100dd 100644
--- a/psyneulink/components/mechanisms/mechanism.py
+++ b/psyneulink/components/mechanisms/mechanism.py
@@ -1299,7 +1299,7 @@ def _parse_arg_input_states(self, input_states):
                             variable = parsed_spec.value
                         except AttributeError:
                             variable = parsed_spec.instance_defaults.variable
-                    else:
+                else:
                     variable = parsed_spec.instance_defaults.variable
 
                 if variable is None:

From d9248ea7a4c2d639f7eab1e218be111e7d55750f Mon Sep 17 00:00:00 2001
From: "jdc@princeton.edu" <jdc@princeton.edu>
Date: Wed, 8 Nov 2017 21:01:23 -0500
Subject: [PATCH 4/6] =?UTF-8?q?=E2=80=A2=20Mechanism,=20PathwayProjection?=
 =?UTF-8?q?=20=20=20-=20fixed=20bugs=20related=20to=20input=5Fstate=20spec?=
 =?UTF-8?q?ifications?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Scripts/Scratch Pad.py                                | 11 ++++++-----
 .../projections/pathway/pathwayprojection.py          | 10 +++++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Scripts/Scratch Pad.py b/Scripts/Scratch Pad.py
index dac279ad979..dedbc3b37f7 100644
--- a/Scripts/Scratch Pad.py	
+++ b/Scripts/Scratch Pad.py	
@@ -416,6 +416,12 @@ def __init__(self, error_value):
 # I = pnl.InputState(reference_value=[0,0,0])
 # pnl.TransferMechanism(input_states=[I])
 
+# p = pnl.MappingProjection()
+# T = pnl.TransferMechanism(input_states=[{pnl.VARIABLE: [0, 0, 0], pnl.PROJECTIONS:[p]}])
+#
+# p = pnl.MappingProjection()
+# T = pnl.TransferMechanism(default_variable=[0, 0], input_states=[p])
+
 #-------------
 # m = pnl.TransferMechanism()
 # i = pnl.InputState(owner=m, reference_value=[0, 0, 0])
@@ -423,11 +429,6 @@ def __init__(self, error_value):
 # m = pnl.TransferMechanism(default_variable=[0, 0, 0])
 # i = pnl.InputState(owner=m, reference_value=[0, 0, 0])
 
-# p = pnl.MappingProjection()
-# T = pnl.TransferMechanism(input_states=[{pnl.VARIABLE: [0, 0, 0], pnl.PROJECTIONS:[p]}])
-
-# p = pnl.MappingProjection()
-# T = pnl.TransferMechanism(default_variable=[0, 0], input_states=[p])
 
 # --------------------------------------------------------------------------------------------------
 
diff --git a/psyneulink/components/projections/pathway/pathwayprojection.py b/psyneulink/components/projections/pathway/pathwayprojection.py
index 7a936c6711f..01d75c81078 100644
--- a/psyneulink/components/projections/pathway/pathwayprojection.py
+++ b/psyneulink/components/projections/pathway/pathwayprojection.py
@@ -87,6 +87,9 @@ def __init__(self,
 
     def _assign_default_projection_name(self, state, sender_name=None, receiver_name=None):
 
+        from psyneulink.components.mechanisms.mechanism import Mechanism
+
+        # If the name is not a default name, leave intact
         if not self.className + '-' in self.name:
             return self.name
 
@@ -98,12 +101,13 @@ def _assign_default_projection_name(self, state, sender_name=None, receiver_name
             self.name = self.className + " from " + sender_name + " to " + receiver_name
 
         elif self.init_status is InitStatus.DEFERRED_INITIALIZATION:
-            if self.init_args[RECEIVER]:
+            if self.init_args[SENDER]:
                 sender = self.init_args[SENDER]
-                if sender.owner:
+                if isinstance(sender.owner, Mechanism):
                     sender_name = "{}[{}]".format(sender.owner.name, sender_name)
+            if self.init_args[RECEIVER]:
                 receiver = self.init_args[RECEIVER]
-                if receiver.owner:
+                if isinstance(receiver.owner, Mechanism):
                     receiver_name = "{}[{}]".format(receiver.owner.name, receiver_name)
             projection_name = self.className + " from " + sender_name + " to " + receiver_name
             self.init_args[NAME] = self.init_args[NAME] or projection_name

From 29b7372fed75094152de59c4a14a4354a78c81a5 Mon Sep 17 00:00:00 2001
From: "jdc@princeton.edu" <jdc@princeton.edu>
Date: Thu, 9 Nov 2017 08:15:28 -0500
Subject: [PATCH 5/6] =?UTF-8?q?=E2=80=A2=20Mechanism,=20PathwayProjection?=
 =?UTF-8?q?=20=20=20-=20fixed=20bugs=20related=20to=20input=5Fstate=20spec?=
 =?UTF-8?q?ifications?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Scripts/Scratch Pad.py                        |  7 ++-
 psyneulink/components/functions/function.py   | 17 ++++++-
 psyneulink/components/mechanisms/mechanism.py | 46 +++++++++++++++----
 psyneulink/components/states/inputstate.py    | 12 ++---
 psyneulink/components/states/state.py         | 19 ++++++--
 5 files changed, 78 insertions(+), 23 deletions(-)

diff --git a/Scripts/Scratch Pad.py b/Scripts/Scratch Pad.py
index dedbc3b37f7..bb5c917dd2b 100644
--- a/Scripts/Scratch Pad.py	
+++ b/Scripts/Scratch Pad.py	
@@ -424,8 +424,13 @@ def __init__(self, error_value):
 
 #-------------
 # m = pnl.TransferMechanism()
-# i = pnl.InputState(owner=m, reference_value=[0, 0, 0])
+# i = pnl.InputState(owner=m, variable=[0, 0, 0], reference_value=[0,0,0])
 
+m = pnl.TransferMechanism()
+i = pnl.InputState(variable=[0,0])
+m.add_states([i])
+m.execute()
+assert True
 # m = pnl.TransferMechanism(default_variable=[0, 0, 0])
 # i = pnl.InputState(owner=m, reference_value=[0, 0, 0])
 
diff --git a/psyneulink/components/functions/function.py b/psyneulink/components/functions/function.py
index c2178169584..48f6e016a36 100644
--- a/psyneulink/components/functions/function.py
+++ b/psyneulink/components/functions/function.py
@@ -186,7 +186,8 @@
 
 from psyneulink.components.component import ComponentError, function_type, method_type, parameter_keywords
 from psyneulink.components.shellclasses import Function
-from psyneulink.globals.keywords import ACCUMULATOR_INTEGRATOR_FUNCTION, ADAPTIVE_INTEGRATOR_FUNCTION, ALL, ANGLE, ARGUMENT_THERAPY_FUNCTION, AUTO_ASSIGN_MATRIX, AUTO_DEPENDENT, BACKPROPAGATION_FUNCTION, BETA, BIAS, COMBINATION_FUNCTION_TYPE, COMBINE_MEANS_FUNCTION, CONSTANT_INTEGRATOR_FUNCTION, CORRELATION, CROSS_ENTROPY, DECAY, DIFFERENCE, DISTANCE_FUNCTION, DISTANCE_METRICS, DIST_FUNCTION_TYPE, DIST_MEAN, DIST_SHAPE, DRIFT_DIFFUSION_INTEGRATOR_FUNCTION, ENERGY, ENTROPY, EUCLIDEAN, EXAMPLE_FUNCTION_TYPE, EXECUTING, EXPONENTIAL_DIST_FUNCTION, EXPONENTIAL_FUNCTION, EXPONENTS, FHN_INTEGRATOR_FUNCTION, FULL_CONNECTIVITY_MATRIX, FUNCTION, FUNCTION_OUTPUT_TYPE, FUNCTION_OUTPUT_TYPE_CONVERSION, FUNCTION_PARAMS, GAIN, GAMMA_DIST_FUNCTION, GILZENRAT_INTEGRATOR_FUNCTION, HEBBIAN_FUNCTION, HIGH, HOLLOW_MATRIX, IDENTITY_MATRIX, INCREMENT, INITIALIZER, INITIALIZING, INPUT_STATES, INTEGRATOR_FUNCTION, INTEGRATOR_FUNCTION_TYPE, INTERCEPT, LEARNING_FUNCTION_TYPE, LEARNING_RATE, LINEAR_COMBINATION_FUNCTION, LINEAR_FUNCTION, LINEAR_MATRIX_FUNCTION, LOGISTIC_FUNCTION, LOW, MATRIX, MATRIX_KEYWORD_NAMES, MATRIX_KEYWORD_VALUES, MAX_INDICATOR, MAX_VAL, NOISE, NORMAL_DIST_FUNCTION, OBJECTIVE_FUNCTION_TYPE, OFFSET, OPERATION, ORNSTEIN_UHLENBECK_INTEGRATOR_FUNCTION, OUTPUT_STATES, OUTPUT_TYPE, PARAMETER_STATE_PARAMS, PEARSON, PROB, PRODUCT, RANDOM_CONNECTIVITY_MATRIX, RATE, RECEIVER, REDUCE_FUNCTION, RL_FUNCTION, SCALE, SIMPLE_INTEGRATOR_FUNCTION, SLOPE, SOFTMAX_FUNCTION, STABILITY_FUNCTION, STANDARD_DEVIATION, SUM, TIME_STEP_SIZE, TRANSFER_FUNCTION_TYPE, UNIFORM_DIST_FUNCTION, USER_DEFINED_FUNCTION, USER_DEFINED_FUNCTION_TYPE, UTILITY_INTEGRATOR_FUNCTION, WALD_DIST_FUNCTION, WEIGHTS, kwComponentCategory, kwPreferenceSetName
+from psyneulink.globals.keywords import VARIABLE, ACCUMULATOR_INTEGRATOR_FUNCTION, ADAPTIVE_INTEGRATOR_FUNCTION, ALL, \
+    ANGLE, ARGUMENT_THERAPY_FUNCTION, AUTO_ASSIGN_MATRIX, AUTO_DEPENDENT, BACKPROPAGATION_FUNCTION, BETA, BIAS, COMBINATION_FUNCTION_TYPE, COMBINE_MEANS_FUNCTION, CONSTANT_INTEGRATOR_FUNCTION, CORRELATION, CROSS_ENTROPY, DECAY, DIFFERENCE, DISTANCE_FUNCTION, DISTANCE_METRICS, DIST_FUNCTION_TYPE, DIST_MEAN, DIST_SHAPE, DRIFT_DIFFUSION_INTEGRATOR_FUNCTION, ENERGY, ENTROPY, EUCLIDEAN, EXAMPLE_FUNCTION_TYPE, EXECUTING, EXPONENTIAL_DIST_FUNCTION, EXPONENTIAL_FUNCTION, EXPONENTS, FHN_INTEGRATOR_FUNCTION, FULL_CONNECTIVITY_MATRIX, FUNCTION, FUNCTION_OUTPUT_TYPE, FUNCTION_OUTPUT_TYPE_CONVERSION, FUNCTION_PARAMS, GAIN, GAMMA_DIST_FUNCTION, GILZENRAT_INTEGRATOR_FUNCTION, HEBBIAN_FUNCTION, HIGH, HOLLOW_MATRIX, IDENTITY_MATRIX, INCREMENT, INITIALIZER, INITIALIZING, INPUT_STATES, INTEGRATOR_FUNCTION, INTEGRATOR_FUNCTION_TYPE, INTERCEPT, LEARNING_FUNCTION_TYPE, LEARNING_RATE, LINEAR_COMBINATION_FUNCTION, LINEAR_FUNCTION, LINEAR_MATRIX_FUNCTION, LOGISTIC_FUNCTION, LOW, MATRIX, MATRIX_KEYWORD_NAMES, MATRIX_KEYWORD_VALUES, MAX_INDICATOR, MAX_VAL, NOISE, NORMAL_DIST_FUNCTION, OBJECTIVE_FUNCTION_TYPE, OFFSET, OPERATION, ORNSTEIN_UHLENBECK_INTEGRATOR_FUNCTION, OUTPUT_STATES, OUTPUT_TYPE, PARAMETER_STATE_PARAMS, PEARSON, PROB, PRODUCT, RANDOM_CONNECTIVITY_MATRIX, RATE, RECEIVER, REDUCE_FUNCTION, RL_FUNCTION, SCALE, SIMPLE_INTEGRATOR_FUNCTION, SLOPE, SOFTMAX_FUNCTION, STABILITY_FUNCTION, STANDARD_DEVIATION, SUM, TIME_STEP_SIZE, TRANSFER_FUNCTION_TYPE, UNIFORM_DIST_FUNCTION, USER_DEFINED_FUNCTION, USER_DEFINED_FUNCTION_TYPE, UTILITY_INTEGRATOR_FUNCTION, WALD_DIST_FUNCTION, WEIGHTS, kwComponentCategory, kwPreferenceSetName
 from psyneulink.globals.preferences.componentpreferenceset import is_pref_set, kpReportOutputPref, kpRuntimeParamStickyAssignmentPref
 from psyneulink.globals.preferences.preferenceset import PreferenceEntry, PreferenceLevel
 from psyneulink.globals.registry import register_category
@@ -2346,8 +2347,20 @@ def function(self,
         intercept = self.paramsCurrent[INTERCEPT]
         outputType = self.functionOutputType
 
+        # MODIFIED 11/9/17 NEW:
+        try:
         # By default, result should be returned as np.ndarray with same dimensionality as input
-        result = variable * slope + intercept
+            result = variable * slope + intercept
+        except TypeError:
+            # If variable is an array with mixed sizes or types, try item-by-item operation
+            if variable.dtype == object:
+                result = np.zeros_like(variable)
+                for i, item in enumerate(variable):
+                    result[i] = variable[i] * slope + intercept
+            else:
+                raise FunctionError("Unrecognized type for {} of {} ({})".format(VARIABLE, self.name, variable))
+        # MODIFIED 11/9/17 END
+
 
         # region Type conversion (specified by outputType):
         # Convert to 2D array, irrespective of variable type:
diff --git a/psyneulink/components/mechanisms/mechanism.py b/psyneulink/components/mechanisms/mechanism.py
index 4153d7100dd..4d27c63163c 100644
--- a/psyneulink/components/mechanisms/mechanism.py
+++ b/psyneulink/components/mechanisms/mechanism.py
@@ -710,14 +710,16 @@ class `UserList <https://docs.python.org/3.6/library/collections.html?highlight=
 from psyneulink.components.component import Component, InitStatus, ExecutionStatus, function_type, method_type
 from psyneulink.components.shellclasses import Function, Mechanism, Projection, State
 from psyneulink.components.states.inputstate import InputState
+from psyneulink.components.states.parameterstate import ParameterState
+from psyneulink.components.states.outputstate import OutputState
 from psyneulink.components.states.state import _parse_state_spec
 from psyneulink.globals.defaults import timeScaleSystemDefault
 from psyneulink.globals.keywords import \
     CHANGED, COMMAND_LINE, EVC_SIMULATION, EXECUTING, FUNCTION_PARAMS, \
     INITIALIZING, INIT_FUNCTION_METHOD_ONLY, INIT__EXECUTE__METHOD_ONLY, \
     INPUT_STATES, INPUT_STATE_PARAMS, MECHANISM_TIME_SCALE, MONITOR_FOR_CONTROL, MONITOR_FOR_LEARNING, \
-    NO_CONTEXT, OUTPUT_STATES, OUTPUT_STATE_PARAMS, PARAMETER_STATE_PARAMS, PROCESS_INIT, SEPARATOR_BAR, \
-    SET_ATTRIBUTE, SYSTEM_INIT, TIME_SCALE, UNCHANGED, VALIDATE, VARIABLE, VALUE, REFERENCE_VALUE, \
+    NO_CONTEXT, OUTPUT_STATES, OUTPUT_STATE_PARAMS, PARAMETER_STATES, PARAMETER_STATE_PARAMS, PROCESS_INIT, \
+    SEPARATOR_BAR, SET_ATTRIBUTE, SYSTEM_INIT, TIME_SCALE, UNCHANGED, VALIDATE, VARIABLE, VALUE, REFERENCE_VALUE, \
     kwMechanismComponentCategory, kwMechanismExecuteFunction
 from psyneulink.globals.preferences.preferenceset import PreferenceLevel
 from psyneulink.globals.registry import register_category
@@ -1012,6 +1014,10 @@ class ClassDefaults(Mechanism.ClassDefaults):
     variableEncodingDim = 2
     valueEncodingDim = 2
 
+    state_list_attr = {InputState:INPUT_STATES,
+                       ParameterState:PARAMETER_STATES,
+                       OutputState:OUTPUT_STATES}
+
     # Category specific defaults:
     paramClassDefaults = Component.paramClassDefaults.copy()
     paramClassDefaults.update({
@@ -1071,7 +1077,8 @@ def __init__(self,
 
         def spec_incompatible_with_default_error(spec_variable, default_variable):
             return MechanismError(
-                'default variable determined from the specified input_states spec ({0}) is not compatible with the specified default variable ({1})'.format(
+                'default variable determined from the specified input_states spec ({0}) '
+                'is not compatible with the specified default variable ({1})'.format(
                     spec_variable, default_variable
                 )
             )
@@ -1288,11 +1295,11 @@ def _parse_arg_input_states(self, input_states):
                 elif isinstance(parsed_spec, (Projection, Mechanism, State)):
                     if parsed_spec.init_status is InitStatus.DEFERRED_INITIALIZATION:
                         args = parsed_spec.init_args
-                        if REFERENCE_VALUE in args:
+                        if REFERENCE_VALUE in args and args[REFERENCE_VALUE] is not None:
                             variable = args[REFERENCE_VALUE]
-                        elif VALUE in args:
+                        elif VALUE in args and args[VALUE] is not None:
                             variable = args[VALUE]
-                        elif VARIABLE in args:
+                        elif VARIABLE in args and args[VARIABLE] is not None:
                             variable = args[VARIABLE]
                     else:
                         try:
@@ -2195,11 +2202,11 @@ def add_states(self, states, context=COMMAND_LINE):
         Mechanism to which it is being added, the user is given the option of reassigning the State to the `owner
         <State_Base.owner>`, making a copy of the State and assigning that to the `owner <State_Base.owner>`, or
         aborting.  If the name of a specified State is the same as an existing one with the same name, an index is
-        appended to its name, and incremented for each State subsequently added with the same name
-        (see :ref:`naming conventions <LINK>`).
+        appended to its name, and incremented for each State subsequently added with the same name (see :ref:`naming
+        conventions <LINK>`).  If a specified State already belongs to the Mechanism, the request is ignored.
 
         .. note::
-            Adding States to a Mechanism changes the size of its `variable <Mechanism_Base.variable>` attribute,
+            Adding InputStates to a Mechanism changes the size of its `variable <Mechanism_Base.variable>` attribute,
             which may produce an incompatibility with its `function <Mechanism_Base.function>` (see
             `Mechanism InputStates` for a more detailed explanation).
 
@@ -2212,6 +2219,11 @@ def add_states(self, states, context=COMMAND_LINE):
             `State specification dictionary <State_Specification>` (the latter must have a *STATE_TYPE* entry
             specifying the class or keyword for InputState or OutputState).
 
+        Returns
+        -------
+
+        Dictionary with entries containing InputStates and/or OutputStates added
+
         """
         from psyneulink.components.states.state import _parse_state_type
         from psyneulink.components.states.inputstate import InputState, _instantiate_input_states
@@ -2237,7 +2249,21 @@ def add_states(self, states, context=COMMAND_LINE):
 
         # _instantiate_state_list(self, input_states, InputState)
         if input_states:
-            instantiated_input_states = _instantiate_input_states(self, input_states, context=context)
+            # FIX: 11/9/17
+            added_variable, added_input_state = self._parse_arg_input_states(input_states)
+            if added_input_state:
+                old_variable = self.instance_defaults.variable.tolist()
+                old_variable.extend(added_variable)
+                self.instance_defaults.variable = np.array(old_variable)
+                # FIX: 11/8/17 - INCLUDE OR NOT:
+                self.function_object.instance_defaults.variable = self.instance_defaults.variable
+                self.function_object.variableClassDefault = self.instance_defaults.variable
+                self.value = self.function()
+                # FIX END
+                instantiated_input_states = _instantiate_input_states(self, input_states,
+                                                                      added_variable,
+                                                                      context=context)
+                # instantiated_input_states = self._instantiate_input_states(input_states, context=context)
         if output_states:
             instantiated_output_states = _instantiate_output_states(self, output_states, context=context)
 
diff --git a/psyneulink/components/states/inputstate.py b/psyneulink/components/states/inputstate.py
index 4ab04c263f7..c9461749b5b 100644
--- a/psyneulink/components/states/inputstate.py
+++ b/psyneulink/components/states/inputstate.py
@@ -719,7 +719,7 @@ def _instantiate_function(self, context=None):
         :return:
         """
 
-        super(InputState, self)._instantiate_function(context=context)
+        super()._instantiate_function(context=context)
 
         # Insure that function is Function.LinearCombination
         if not isinstance(self.function.__self__, (LinearCombination, Linear)):
@@ -729,14 +729,14 @@ def _instantiate_function(self, context=None):
                                              self.owner.name,
                                              self.function.__self__.componentName, ))
 
-        # Insure that self.value is compatible with (relevant item of) self.reference_value
+        # Insure that self.value is compatible with self.reference_value
         if not iscompatible(self.value, self.reference_value):
-            raise InputStateError("Value ({}) of {} {} for {} is not compatible with "
-                                           "the variable ({}) of its function".
+            raise InputStateError("Value ({}) of {} {} for {} is not compatible with specified {} ({})".
                                            format(self.value,
                                                   self.componentName,
                                                   self.name,
                                                   self.owner.name,
+                                                  REFERENCE_VALUE,
                                                   self.reference_value))
                                                   # self.owner.variable))
 
@@ -909,7 +909,7 @@ def pathway_projections(self, assignment):
 
 
 # def _instantiate_input_states(owner, input_states=None, context=None):
-def _instantiate_input_states(owner, input_states=None, context=None):
+def _instantiate_input_states(owner, input_states=None, reference_value=None, context=None):
     """Call State._instantiate_state_list() to instantiate ContentAddressableList of InputState(s)
 
     Create ContentAddressableList of InputState(s) specified in paramsCurrent[INPUT_STATES]
@@ -944,7 +944,7 @@ def _instantiate_input_states(owner, input_states=None, context=None):
                                          state_list=input_states,
                                          state_type=InputState,
                                          state_param_identifier=INPUT_STATE,
-                                         reference_value=owner.instance_defaults.variable,
+                                         reference_value=reference_value or owner.instance_defaults.variable,
                                          reference_value_name=VARIABLE,
                                          context=context)
 
diff --git a/psyneulink/components/states/state.py b/psyneulink/components/states/state.py
index f299d325b9c..ec927ef01af 100644
--- a/psyneulink/components/states/state.py
+++ b/psyneulink/components/states/state.py
@@ -571,7 +571,7 @@ def test_multiple_modulatory_projections_with_mech_and_state_name_specs(self):
 from psyneulink.components.functions.function import LinearCombination, ModulationParam, _get_modulated_param, get_param_value_for_function, get_param_value_for_keyword
 from psyneulink.components.shellclasses import Mechanism, Process_Base, Projection, State
 from psyneulink.globals.keywords import \
-    CONTEXT, CONTROL_PROJECTION_PARAMS, CONTROL_SIGNAL_SPECS, EXECUTING, FUNCTION, FUNCTION_PARAMS, \
+    CONTEXT, COMMAND_LINE, CONTROL_PROJECTION_PARAMS, CONTROL_SIGNAL_SPECS, EXECUTING, FUNCTION, FUNCTION_PARAMS, \
     GATING_PROJECTION_PARAMS, GATING_SIGNAL_SPECS, INITIALIZING, \
     LEARNING, LEARNING_PROJECTION_PARAMS, LEARNING_SIGNAL_SPECS, \
     MAPPING_PROJECTION_PARAMS, MECHANISM, \
@@ -965,6 +965,13 @@ def __init__(self,
             #                       if params = NotImplemented or there is no param[PROJECTIONS]
             pass
 
+        # if owner:
+        #     assert True
+        #     state_list = getattr(owner, owner.state_list_attr[self.__class__])
+        #     if state_list and not self in state_list:
+        #         owner.add_states(self)
+
+
     def _handle_size(self, size, variable):
         """Overwrites the parent method in Component.py, because the variable of a State
             is generally 1D, rather than 2D as in the case of Mechanisms"""
@@ -2155,9 +2162,13 @@ def _instantiate_state(state_type:_is_state_class,           # State's type
 
         # FIX: THIS SHOULD ONLY APPLY TO InputState AND ParameterState; WHAT ABOUT OutputState?
         # State's assigned value is incompatible with its reference_value (presumably its owner Mechanism's variable)
-        if not iscompatible(state.value, reference_value):
-            raise StateError("{}'s value attribute ({}) is incompatible with the variable ({}) of its owner ({})".
-                             format(state.name, state.value, state.reference_value, owner.name))
+        # MODIFIED 11/9/17 OLD:
+        # if not iscompatible(state.value, reference_value):
+        # MODIFIED 11/9/17 NEW:
+        if not iscompatible(state.value, state.reference_value):
+        # MODIFIED 11/9/17 END
+            raise StateError("{}'s value attribute ({}) is incompatible with the {} ({}) of its owner ({})".
+                             format(state.name, state.value, REFERENCE_VALUE, state.reference_value, owner.name))
 
         # State has already been assigned to an owner
         if state.owner is not None and not state.owner is owner:

From 7d2d8243e42ca51f97ed986bbfc267543e5bb271 Mon Sep 17 00:00:00 2001
From: "jdc@princeton.edu" <jdc@princeton.edu>
Date: Thu, 9 Nov 2017 11:02:30 -0500
Subject: [PATCH 6/6] =?UTF-8?q?=E2=80=A2=20Mechanism=20=20=20-=20=5Fparse?=
 =?UTF-8?q?=5Farg=5Finput=5Fstates,=20add=5Fstates:=20=20modified=20to=20a?=
 =?UTF-8?q?ccomdodate=20deferred=5Finit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Scripts/Scratch Pad.py                | 17 ++++++++++++-----
 psyneulink/components/states/state.py | 14 +++++++++-----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/Scripts/Scratch Pad.py b/Scripts/Scratch Pad.py
index bb5c917dd2b..315d2d0fc22 100644
--- a/Scripts/Scratch Pad.py	
+++ b/Scripts/Scratch Pad.py	
@@ -426,14 +426,21 @@ def __init__(self, error_value):
 # m = pnl.TransferMechanism()
 # i = pnl.InputState(owner=m, variable=[0, 0, 0], reference_value=[0,0,0])
 
-m = pnl.TransferMechanism()
-i = pnl.InputState(variable=[0,0])
-m.add_states([i])
-m.execute()
-assert True
 # m = pnl.TransferMechanism(default_variable=[0, 0, 0])
 # i = pnl.InputState(owner=m, reference_value=[0, 0, 0])
 
+# WORKS:
+# m = pnl.TransferMechanism()
+# i = pnl.InputState(variable=[0,0])
+# m.add_states([i])
+# m.execute()
+# assert True
+
+m = pnl.TransferMechanism(default_variable=[0, 0, 0])
+i = pnl.InputState(owner=m, variable=[0, 0, 0])
+# m.add_states([i])
+# m.execute()
+assert True
 
 # --------------------------------------------------------------------------------------------------
 
diff --git a/psyneulink/components/states/state.py b/psyneulink/components/states/state.py
index ec927ef01af..ffa46c678eb 100644
--- a/psyneulink/components/states/state.py
+++ b/psyneulink/components/states/state.py
@@ -2413,13 +2413,17 @@ def _parse_state_spec(state_type=None,
         if isinstance(state_specification, state_type):
             # Make sure that the specified State belongs to the Mechanism passed in the owner arg
             if state_specification.init_status is InitStatus.DEFERRED_INITIALIZATION:
-                owner = state_specification.init_args[OWNER]
+                state_owner = state_specification.init_args[OWNER]
             else:
-                owner = state_specification.owner
-            if owner is not None and not state_specification.owner is owner:
+                state_owner = state_specification.owner
+            if owner is not None and not state_owner is owner:
                 raise StateError("The State specified in a call to _instantiate_state ({}) "
-                                 "does belong to the {} specified in the \'{}\' argument ({})".
-                                 format(state_specification.name, owner.name, Mechanism.__name__, OWNER, owner.name))
+                                 "does not belong to the {} specified in the \'{}\' argument ({})".
+                                 format(state_specification.name,
+                                        owner.name,
+                                        Mechanism.__name__,
+                                        OWNER,
+                                        state_owner.name))
             return state_specification
 
         else: