diff --git a/kotlin/accumulate/.gradle/3.5-rc-2/file-changes/last-build.bin b/kotlin/accumulate/.gradle/3.5-rc-2/file-changes/last-build.bin
new file mode 100644
index 0000000..f76dd23
Binary files /dev/null and b/kotlin/accumulate/.gradle/3.5-rc-2/file-changes/last-build.bin differ
diff --git a/kotlin/accumulate/.gradle/3.5-rc-2/taskHistory/taskHistory.lock b/kotlin/accumulate/.gradle/3.5-rc-2/taskHistory/taskHistory.lock
new file mode 100644
index 0000000..e37911d
Binary files /dev/null and b/kotlin/accumulate/.gradle/3.5-rc-2/taskHistory/taskHistory.lock differ
diff --git a/kotlin/accumulate/.gradle/buildOutputCleanup/cache.properties b/kotlin/accumulate/.gradle/buildOutputCleanup/cache.properties
index 32950c7..abcae48 100644
--- a/kotlin/accumulate/.gradle/buildOutputCleanup/cache.properties
+++ b/kotlin/accumulate/.gradle/buildOutputCleanup/cache.properties
@@ -1,2 +1,2 @@
-#Sun Jun 04 16:28:56 EDT 2017
-gradle.version=3.5
+#Sun Jul 23 23:44:51 EDT 2017
+gradle.version=3.5-rc-2
diff --git a/kotlin/accumulate/.idea/modules/accumulate_main.iml b/kotlin/accumulate/.idea/modules/accumulate_main.iml
index dead50e..7614549 100644
--- a/kotlin/accumulate/.idea/modules/accumulate_main.iml
+++ b/kotlin/accumulate/.idea/modules/accumulate_main.iml
@@ -13,19 +13,19 @@
           <option name="loadBuiltInsFromDependencies" value="true" />
           <option name="languageVersion" value="1.1" />
           <option name="apiVersion" value="1.1" />
+          <option name="pluginOptions">
+            <array />
+          </option>
           <option name="pluginClasspaths">
             <array />
           </option>
           <option name="coroutinesWarn" value="true" />
-          <option name="pluginOptions">
-            <array />
-          </option>
         </compilerArguments>
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/../../build/classes/main" />
+    <output url="file://$MODULE_DIR$/../../out/production/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../src/main">
       <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
diff --git a/kotlin/accumulate/.idea/modules/accumulate_test.iml b/kotlin/accumulate/.idea/modules/accumulate_test.iml
index c77f5aa..bd5750b 100644
--- a/kotlin/accumulate/.idea/modules/accumulate_test.iml
+++ b/kotlin/accumulate/.idea/modules/accumulate_test.iml
@@ -13,19 +13,19 @@
           <option name="loadBuiltInsFromDependencies" value="true" />
           <option name="languageVersion" value="1.1" />
           <option name="apiVersion" value="1.1" />
+          <option name="pluginOptions">
+            <array />
+          </option>
           <option name="pluginClasspaths">
             <array />
           </option>
           <option name="coroutinesWarn" value="true" />
-          <option name="pluginOptions">
-            <array />
-          </option>
         </compilerArguments>
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
+    <output-test url="file://$MODULE_DIR$/../../out/test/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../src/test">
       <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
diff --git a/kotlin/accumulate/.idea/workspace.xml b/kotlin/accumulate/.idea/workspace.xml
index bdaa04b..e151c15 100644
--- a/kotlin/accumulate/.idea/workspace.xml
+++ b/kotlin/accumulate/.idea/workspace.xml
@@ -4,6 +4,7 @@
     <list default="true" id="c2a0f510-3a56-4896-9779-0fa53647bbde" name="Default" comment="" />
     <ignored path="$PROJECT_DIR$/.gradle/" />
     <ignored path="$PROJECT_DIR$/build/" />
+    <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -11,19 +12,18 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="ExternalProjectsData">
     <projectState path="$PROJECT_DIR$">
       <ProjectState />
     </projectState>
   </component>
   <component name="FileEditorManager">
-    <leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="450">
       <file leaf-file-name="AccumulateTest.kt" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/test/kotlin/AccumulateTest.kt">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1437">
-              <caret line="56" column="1" lean-forward="true" selection-start-line="56" selection-start-column="1" selection-end-line="56" selection-end-column="1" />
+            <state relative-caret-position="160">
+              <caret line="18" column="44" lean-forward="false" selection-start-line="18" selection-start-column="44" selection-end-line="18" selection-end-column="44" />
               <folding />
             </state>
           </provider>
@@ -32,7 +32,7 @@
       <file leaf-file-name="Accumulate.kt" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/kotlin/Accumulate.kt">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="344">
+            <state relative-caret-position="176">
               <caret line="8" column="1" lean-forward="false" selection-start-line="8" selection-start-column="1" selection-end-line="8" selection-end-column="1" />
               <folding />
             </state>
@@ -56,7 +56,7 @@
   <component name="GradleLocalSettings">
     <option name="myGradleHomes">
       <map>
-        <entry key="$PROJECT_DIR$" value="C:\Gradle\gradle-3.5" />
+        <entry key="$PROJECT_DIR$" value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.5-rc-2-bin/7ktl4k9rdug30mawecgppf5ms/gradle-3.5-rc-2" />
       </map>
     </option>
     <option name="myGradleVersions">
@@ -249,7 +249,7 @@
     </option>
     <option name="modificationStamps">
       <map>
-        <entry key="$PROJECT_DIR$" value="1496608052256" />
+        <entry key="$PROJECT_DIR$" value="1500866124000" />
       </map>
     </option>
     <option name="projectBuildClasspath">
@@ -295,76 +295,6 @@
               <option name="name" value="accumulate" />
               <option name="projectBuildClasspath">
                 <list>
-                  <option value="C:/Gradle/gradle-3.5/lib/ant-1.9.6.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/ant-launcher-1.9.6.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-base-services-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-base-services-groovy-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-cli-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-core-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-docs-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-installation-beacon-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-jvm-services-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-launcher-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-logging-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-messaging-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-model-core-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-model-groovy-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-native-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-open-api-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-process-services-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-resources-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-runtime-api-info-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-script-kotlin-0.8.0.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-tooling-api-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-ui-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-version-info-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/gradle-wrapper-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/groovy-all-2.4.10.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-announce-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-antlr-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-build-cache-http-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-build-comparison-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-build-init-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-code-quality-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-composite-builds-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-dependency-management-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-diagnostics-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-ear-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-ide-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-ide-native-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-ide-play-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-ivy-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-jacoco-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-javascript-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-jetty-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-language-groovy-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-language-java-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-language-jvm-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-language-native-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-language-scala-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-maven-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-osgi-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-platform-base-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-platform-jvm-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-platform-native-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-platform-play-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-plugin-development-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-plugin-use-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-plugins-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-publish-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-reporting-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-resources-http-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-resources-s3-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-resources-sftp-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-scala-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-signing-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-test-kit-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-testing-base-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-testing-jvm-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-testing-native-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-tooling-api-builders-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/gradle-workers-3.5.jar" />
-                  <option value="C:/Gradle/gradle-3.5/lib/plugins/ivy-2.2.0.jar" />
                   <option value="$PROJECT_DIR$/buildSrc/src/main/java" />
                   <option value="$PROJECT_DIR$/buildSrc/src/main/groovy" />
                 </list>
@@ -386,11 +316,15 @@
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-16" />
-    <option name="y" value="-16" />
-    <option name="width" value="3872" />
-    <option name="height" value="2092" />
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="width" value="2560" />
+    <option name="height" value="1390" />
   </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
@@ -407,72 +341,58 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
+      <pane id="Scope" />
+      <pane id="AndroidView" />
       <pane id="Scratches" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="accumulate" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="accumulate" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="accumulate" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="accumulate" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="test" />
-              <option name="myItemType" value="org.jetbrains.plugins.gradle.projectView.GradleTreeStructureProvider$GradleSourceSetDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="kotlin" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="accumulate" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="accumulate" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="org.jetbrains.plugins.gradle.projectView.GradleTreeStructureProvider$GradleSourceSetDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="kotlin" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
+          <expand>
+            <path>
+              <item name="accumulate" type="b2602c69:ProjectViewProjectNode" />
+              <item name="accumulate" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+            </path>
+            <path>
+              <item name="accumulate" type="b2602c69:ProjectViewProjectNode" />
+              <item name="accumulate" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="accumulate" type="b2602c69:ProjectViewProjectNode" />
+              <item name="accumulate" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+            </path>
+            <path>
+              <item name="accumulate" type="b2602c69:ProjectViewProjectNode" />
+              <item name="accumulate" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="kotlin" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="accumulate" type="b2602c69:ProjectViewProjectNode" />
+              <item name="accumulate" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+            </path>
+            <path>
+              <item name="accumulate" type="b2602c69:ProjectViewProjectNode" />
+              <item name="accumulate" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="kotlin" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../pangram" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../diamond" />
+    <property name="aspect.path.notification.shown" value="true" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -487,7 +407,7 @@
     </option>
   </component>
   <component name="RunManager" selected="JUnit.AccumulateTest">
-    <configuration default="false" name="AccumulateTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="AccumulateTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <module name="accumulate_test" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -506,7 +426,6 @@
       </option>
       <envs />
       <patterns />
-      <method />
     </configuration>
     <configuration default="true" type="Applet" factoryName="Applet">
       <option name="HTML_USED" value="false" />
@@ -514,7 +433,6 @@
       <option name="HEIGHT" value="300" />
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
       <module />
-      <method />
     </configuration>
     <configuration default="true" type="Application" factoryName="Application">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
@@ -529,7 +447,66 @@
       <option name="PASS_PARENT_ENVS" value="true" />
       <module name="" />
       <envs />
-      <method />
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+      <option name="PROGRAM_PARAMETERS" />
+      <predefined_log_file id="idea.log" enabled="true" />
+    </configuration>
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+    </configuration>
+    <configuration default="true" type="TestNG" factoryName="TestNG">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <option name="OUTPUT_DIRECTORY" />
+      <option name="ANNOTATION_TYPE" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
+      <option name="PROPERTIES_FILE" />
+      <envs />
+      <properties />
+      <listeners />
     </configuration>
     <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
@@ -566,27 +543,6 @@
       </ExternalSystemSettings>
       <method />
     </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
     <configuration default="true" type="JarApplication" factoryName="JAR Application">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <envs />
@@ -633,14 +589,6 @@
       <envs />
       <method />
     </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
-    </configuration>
     <configuration default="true" type="ScalaTestRunConfiguration" factoryName="ScalaTest">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <module name="" />
@@ -685,34 +633,6 @@
       <envs />
       <method />
     </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
     <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher">
       <method />
     </configuration>
@@ -738,20 +658,14 @@
       <envs />
       <method />
     </configuration>
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="JUnit.AccumulateTest" />
-    </list>
     <recent_temporary>
       <list size="1">
         <item index="0" class="java.lang.String" itemvalue="JUnit.AccumulateTest" />
       </list>
     </recent_temporary>
-    <configuration name="&lt;template&gt;" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" default="true" selected="false">
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-    </configuration>
   </component>
   <component name="SbtLocalSettings">
-    <option name="lastUpdateTimestamp" value="1496608138091" />
+    <option name="lastUpdateTimestamp" value="1500867898481" />
     <option name="externalProjectsViewState">
       <projects_view />
     </option>
@@ -767,6 +681,9 @@
       <option name="presentableId" value="Default" />
       <updated>1496608125326</updated>
       <workItem from="1496608129082" duration="924000" />
+      <workItem from="1500867737016" duration="94000" />
+      <workItem from="1500867857655" duration="66000" />
+      <workItem from="1500868251698" duration="10000" />
     </task>
     <servers />
   </component>
@@ -777,39 +694,50 @@
     <history-entry file="AccumulateTest - 2017.06.04 at 16h 40m 39s.xml">
       <configuration name="AccumulateTest" configurationId="JUnit" />
     </history-entry>
+    <history-entry file="AccumulateTest - 2017.07.23 at 23h 45m 17s.xml">
+      <configuration name="AccumulateTest" configurationId="JUnit" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="924000" />
+    <option name="totallyTimeSpent" value="1094000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-16" y="-16" width="3872" height="2092" extended-state="6" />
+    <frame x="0" y="0" width="2562" height="1391" extended-state="6" />
     <layout>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32990807" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="SBT" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32990807" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32990807" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290008" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24960938" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32990807" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="SBT" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -822,20 +750,17 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="0">
-            <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-            <folding />
-          </first_editor>
-          <second_editor />
+    <entry file="file://$PROJECT_DIR$/src/test/kotlin/AccumulateTest.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/kotlin/Accumulate.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="344">
+        <state relative-caret-position="176">
           <caret line="8" column="1" lean-forward="false" selection-start-line="8" selection-start-column="1" selection-end-line="8" selection-end-column="1" />
           <folding />
         </state>
@@ -843,11 +768,77 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/test/kotlin/AccumulateTest.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1437">
-          <caret line="56" column="1" lean-forward="true" selection-start-line="56" selection-start-column="1" selection-end-line="56" selection-end-column="1" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/kotlin/Accumulate.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" column="1" lean-forward="false" selection-start-line="8" selection-start-column="1" selection-end-line="8" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/kotlin/AccumulateTest.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/kotlin/Accumulate.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" column="1" lean-forward="false" selection-start-line="8" selection-start-column="1" selection-end-line="8" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="0">
+            <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/kotlin/Accumulate.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="8" column="1" lean-forward="false" selection-start-line="8" selection-start-column="1" selection-end-line="8" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/kotlin/AccumulateTest.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="18" column="44" lean-forward="false" selection-start-line="18" selection-start-column="44" selection-end-line="18" selection-end-column="44" />
           <folding />
         </state>
       </provider>
     </entry>
   </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
 </project>
\ No newline at end of file
diff --git a/kotlin/accumulate/accumulate.iml b/kotlin/accumulate/accumulate.iml
index 12d240a..d1c9596 100644
--- a/kotlin/accumulate/accumulate.iml
+++ b/kotlin/accumulate/accumulate.iml
@@ -5,6 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/out" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/kotlin/accumulate/build/classes/test/AccumulateTest$accumulateReversedStrings$1.class b/kotlin/accumulate/build/classes/test/AccumulateTest$accumulateReversedStrings$1.class
deleted file mode 100644
index 4a010ff..0000000
Binary files a/kotlin/accumulate/build/classes/test/AccumulateTest$accumulateReversedStrings$1.class and /dev/null differ
diff --git a/kotlin/accumulate/build/classes/test/AccumulateTest$accumulateUpperCases$1.class b/kotlin/accumulate/build/classes/test/AccumulateTest$accumulateUpperCases$1.class
deleted file mode 100644
index 879fbd7..0000000
Binary files a/kotlin/accumulate/build/classes/test/AccumulateTest$accumulateUpperCases$1.class and /dev/null differ
diff --git a/kotlin/accumulate/build/classes/main/Accumulate.class b/kotlin/accumulate/out/production/classes/Accumulate.class
similarity index 98%
rename from kotlin/accumulate/build/classes/main/Accumulate.class
rename to kotlin/accumulate/out/production/classes/Accumulate.class
index dd82beb..5b3d5e5 100644
Binary files a/kotlin/accumulate/build/classes/main/Accumulate.class and b/kotlin/accumulate/out/production/classes/Accumulate.class differ
diff --git a/kotlin/accumulate/out/test/classes/AccumulateTest$accumulateReversedStrings$1.class b/kotlin/accumulate/out/test/classes/AccumulateTest$accumulateReversedStrings$1.class
new file mode 100644
index 0000000..c80d749
Binary files /dev/null and b/kotlin/accumulate/out/test/classes/AccumulateTest$accumulateReversedStrings$1.class differ
diff --git a/kotlin/accumulate/build/classes/test/AccumulateTest$accumulateSquares$1.class b/kotlin/accumulate/out/test/classes/AccumulateTest$accumulateSquares$1.class
similarity index 94%
rename from kotlin/accumulate/build/classes/test/AccumulateTest$accumulateSquares$1.class
rename to kotlin/accumulate/out/test/classes/AccumulateTest$accumulateSquares$1.class
index c8721e0..96544e1 100644
Binary files a/kotlin/accumulate/build/classes/test/AccumulateTest$accumulateSquares$1.class and b/kotlin/accumulate/out/test/classes/AccumulateTest$accumulateSquares$1.class differ
diff --git a/kotlin/accumulate/build/classes/test/AccumulateTest$accumulateToDifferentType$1.class b/kotlin/accumulate/out/test/classes/AccumulateTest$accumulateToDifferentType$1.class
similarity index 95%
rename from kotlin/accumulate/build/classes/test/AccumulateTest$accumulateToDifferentType$1.class
rename to kotlin/accumulate/out/test/classes/AccumulateTest$accumulateToDifferentType$1.class
index 021f646..4d27176 100644
Binary files a/kotlin/accumulate/build/classes/test/AccumulateTest$accumulateToDifferentType$1.class and b/kotlin/accumulate/out/test/classes/AccumulateTest$accumulateToDifferentType$1.class differ
diff --git a/kotlin/accumulate/out/test/classes/AccumulateTest$accumulateUpperCases$1.class b/kotlin/accumulate/out/test/classes/AccumulateTest$accumulateUpperCases$1.class
new file mode 100644
index 0000000..9881adb
Binary files /dev/null and b/kotlin/accumulate/out/test/classes/AccumulateTest$accumulateUpperCases$1.class differ
diff --git a/kotlin/accumulate/build/classes/test/AccumulateTest$accumulateWithinAccumulate$1$1.class b/kotlin/accumulate/out/test/classes/AccumulateTest$accumulateWithinAccumulate$1$1.class
similarity index 95%
rename from kotlin/accumulate/build/classes/test/AccumulateTest$accumulateWithinAccumulate$1$1.class
rename to kotlin/accumulate/out/test/classes/AccumulateTest$accumulateWithinAccumulate$1$1.class
index 2caa1f0..38d6cde 100644
Binary files a/kotlin/accumulate/build/classes/test/AccumulateTest$accumulateWithinAccumulate$1$1.class and b/kotlin/accumulate/out/test/classes/AccumulateTest$accumulateWithinAccumulate$1$1.class differ
diff --git a/kotlin/accumulate/build/classes/test/AccumulateTest$accumulateWithinAccumulate$1.class b/kotlin/accumulate/out/test/classes/AccumulateTest$accumulateWithinAccumulate$1.class
similarity index 96%
rename from kotlin/accumulate/build/classes/test/AccumulateTest$accumulateWithinAccumulate$1.class
rename to kotlin/accumulate/out/test/classes/AccumulateTest$accumulateWithinAccumulate$1.class
index 319b8fa..8c9cfc4 100644
Binary files a/kotlin/accumulate/build/classes/test/AccumulateTest$accumulateWithinAccumulate$1.class and b/kotlin/accumulate/out/test/classes/AccumulateTest$accumulateWithinAccumulate$1.class differ
diff --git a/kotlin/accumulate/build/classes/test/AccumulateTest$emptyAccumulateProducesEmptyAccumulation$1.class b/kotlin/accumulate/out/test/classes/AccumulateTest$emptyAccumulateProducesEmptyAccumulation$1.class
similarity index 94%
rename from kotlin/accumulate/build/classes/test/AccumulateTest$emptyAccumulateProducesEmptyAccumulation$1.class
rename to kotlin/accumulate/out/test/classes/AccumulateTest$emptyAccumulateProducesEmptyAccumulation$1.class
index b720d07..df79ecf 100644
Binary files a/kotlin/accumulate/build/classes/test/AccumulateTest$emptyAccumulateProducesEmptyAccumulation$1.class and b/kotlin/accumulate/out/test/classes/AccumulateTest$emptyAccumulateProducesEmptyAccumulation$1.class differ
diff --git a/kotlin/accumulate/build/classes/test/AccumulateTest.class b/kotlin/accumulate/out/test/classes/AccumulateTest.class
similarity index 88%
rename from kotlin/accumulate/build/classes/test/AccumulateTest.class
rename to kotlin/accumulate/out/test/classes/AccumulateTest.class
index ab61684..3a06019 100644
Binary files a/kotlin/accumulate/build/classes/test/AccumulateTest.class and b/kotlin/accumulate/out/test/classes/AccumulateTest.class differ
diff --git a/kotlin/diamond/.gradle/3.5-rc-2/file-changes/last-build.bin b/kotlin/diamond/.gradle/3.5-rc-2/file-changes/last-build.bin
new file mode 100644
index 0000000..f76dd23
Binary files /dev/null and b/kotlin/diamond/.gradle/3.5-rc-2/file-changes/last-build.bin differ
diff --git a/kotlin/diamond/.gradle/3.5-rc-2/taskHistory/taskHistory.lock b/kotlin/diamond/.gradle/3.5-rc-2/taskHistory/taskHistory.lock
new file mode 100644
index 0000000..87133cc
Binary files /dev/null and b/kotlin/diamond/.gradle/3.5-rc-2/taskHistory/taskHistory.lock differ
diff --git a/kotlin/diamond/.gradle/buildOutputCleanup/cache.properties b/kotlin/diamond/.gradle/buildOutputCleanup/cache.properties
index 073f216..77367f7 100644
--- a/kotlin/diamond/.gradle/buildOutputCleanup/cache.properties
+++ b/kotlin/diamond/.gradle/buildOutputCleanup/cache.properties
@@ -1,2 +1,2 @@
-#Sun Jul 23 22:11:50 EDT 2017
-gradle.version=4.0.1
+#Sun Jul 23 23:51:11 EDT 2017
+gradle.version=3.5-rc-2
diff --git a/kotlin/diamond/.idea/modules/diamond_test.iml b/kotlin/diamond/.idea/modules/diamond_test.iml
index a94095a..583ac04 100644
--- a/kotlin/diamond/.idea/modules/diamond_test.iml
+++ b/kotlin/diamond/.idea/modules/diamond_test.iml
@@ -34,12 +34,12 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="diamond_main" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test-junit:1.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test:1.1.1" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1.1" level="project" />
     <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test-junit:1.1.1" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
     <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test:1.1.1" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="diamond_main" />
 </module>
\ No newline at end of file
diff --git a/kotlin/diamond/.idea/workspace.xml b/kotlin/diamond/.idea/workspace.xml
index 6c6ade9..fa3bb9e 100644
--- a/kotlin/diamond/.idea/workspace.xml
+++ b/kotlin/diamond/.idea/workspace.xml
@@ -18,12 +18,12 @@
     </projectState>
   </component>
   <component name="FileEditorManager">
-    <leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="450">
       <file leaf-file-name="DiamondPrinterTest.kt" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/test/kotlin/DiamondPrinterTest.kt">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="338">
-              <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
+            <state relative-caret-position="248">
+              <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -32,24 +32,37 @@
       <file leaf-file-name="DiamondPrinter.kt" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/kotlin/DiamondPrinter.kt">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="78">
-              <caret line="3" column="5" lean-forward="false" selection-start-line="3" selection-start-column="5" selection-end-line="3" selection-end-column="5" />
+            <state relative-caret-position="286">
+              <caret line="13" column="41" lean-forward="true" selection-start-line="13" selection-start-column="41" selection-end-line="13" selection-end-column="41" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/README.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="0">
+                <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+                <folding />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="GradleLocalSettings">
     <option name="myGradleHomes">
       <map>
-        <entry key="$PROJECT_DIR$" value="G:\Gradle\gradle-4.0.1" />
+        <entry key="$PROJECT_DIR$" value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.5-rc-2-bin/7ktl4k9rdug30mawecgppf5ms/gradle-3.5-rc-2" />
       </map>
     </option>
     <option name="myGradleVersions">
       <map>
-        <entry key="$PROJECT_DIR$" value="4.0.1" />
+        <entry key="$PROJECT_DIR$" value="3.5" />
       </map>
     </option>
     <option name="availableProjects">
@@ -237,7 +250,7 @@
     </option>
     <option name="modificationStamps">
       <map>
-        <entry key="$PROJECT_DIR$" value="1500859365388" />
+        <entry key="$PROJECT_DIR$" value="1500866124000" />
       </map>
     </option>
     <option name="projectBuildClasspath">
@@ -283,75 +296,6 @@
               <option name="name" value="diamond" />
               <option name="projectBuildClasspath">
                 <list>
-                  <option value="G:/Gradle/gradle-4.0.1/lib/ant-1.9.6.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/ant-launcher-1.9.6.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-base-services-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-base-services-groovy-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-cli-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-core-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-docs-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-installation-beacon-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-jvm-services-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-launcher-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-logging-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-messaging-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-model-core-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-model-groovy-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-native-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-process-services-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-resources-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-runtime-api-info-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-script-kotlin-0.9.0.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-script-kotlin-compiler-plugin-0.9.0.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-script-kotlin-tooling-builders-0.9.0.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-script-kotlin-tooling-models-0.9.0.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-tooling-api-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/gradle-wrapper-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/groovy-all-2.4.11.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-announce-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-antlr-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-build-cache-http-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-build-comparison-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-build-init-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-code-quality-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-composite-builds-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-dependency-management-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-diagnostics-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-ear-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-ide-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-ide-native-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-ide-play-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-ivy-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-jacoco-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-javascript-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-language-groovy-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-language-java-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-language-jvm-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-language-native-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-language-scala-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-maven-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-osgi-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-platform-base-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-platform-jvm-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-platform-native-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-platform-play-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-plugin-development-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-plugin-use-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-plugins-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-publish-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-reporting-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-resources-http-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-resources-s3-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-resources-sftp-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-scala-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-signing-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-test-kit-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-testing-base-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-testing-jvm-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-testing-native-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-tooling-api-builders-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/gradle-workers-4.0.1.jar" />
-                  <option value="G:/Gradle/gradle-4.0.1/lib/plugins/ivy-2.2.0.jar" />
                   <option value="$PROJECT_DIR$/buildSrc/src/main/java" />
                   <option value="$PROJECT_DIR$/buildSrc/src/main/groovy" />
                 </list>
@@ -379,10 +323,8 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-9" />
-    <option name="y" value="-9" />
-    <option name="width" value="2578" />
-    <option name="height" value="1408" />
+    <option name="width" value="2552" />
+    <option name="height" value="1390" />
   </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
@@ -406,52 +348,22 @@
               <item name="diamond" type="b2602c69:ProjectViewProjectNode" />
               <item name="diamond" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
             </path>
-            <path>
-              <item name="diamond" type="b2602c69:ProjectViewProjectNode" />
-              <item name="diamond" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="diamond" type="b2602c69:ProjectViewProjectNode" />
-              <item name="diamond" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-            </path>
-            <path>
-              <item name="diamond" type="b2602c69:ProjectViewProjectNode" />
-              <item name="diamond" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-              <item name="kotlin" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="diamond" type="b2602c69:ProjectViewProjectNode" />
-              <item name="diamond" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-            </path>
-            <path>
-              <item name="diamond" type="b2602c69:ProjectViewProjectNode" />
-              <item name="diamond" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-              <item name="kotlin" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="AndroidView" />
-      <pane id="Scope" />
       <pane id="Scratches" />
+      <pane id="Scope" />
+      <pane id="AndroidView" />
       <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="settings.editor.selected.configurable" value="preferences.sourceCode" />
-    <property name="settings.editor.splitter.proportion" value="0.2" />
+    <property name="last_opened_file_path" value="$USER_HOME$/emerald-randomizer/code/EmeraldRandomizer" />
+    <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
     <property name="aspect.path.notification.shown" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -526,6 +438,12 @@
       <envs />
       <patterns />
     </configuration>
+    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+      <option name="PROGRAM_PARAMETERS" />
+      <predefined_log_file id="idea.log" enabled="true" />
+    </configuration>
     <configuration default="true" type="Remote" factoryName="Remote">
       <option name="USE_SOCKET_TRANSPORT" value="true" />
       <option name="SERVER_MODE" value="false" />
@@ -533,14 +451,32 @@
       <option name="HOST" value="localhost" />
       <option name="PORT" value="5005" />
     </configuration>
-    <configuration name="&lt;template&gt;" type="TestNG" default="true" selected="false">
+    <configuration default="true" type="TestNG" factoryName="TestNG">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
+      <option name="PACKAGE_NAME" />
       <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="CLASS" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    </configuration>
-    <configuration name="&lt;template&gt;" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" default="true" selected="false">
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+      <option name="OUTPUT_DIRECTORY" />
+      <option name="ANNOTATION_TYPE" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
+      <option name="PROPERTIES_FILE" />
+      <envs />
+      <properties />
+      <listeners />
     </configuration>
     <recent_temporary>
       <list size="1">
@@ -548,49 +484,94 @@
       </list>
     </recent_temporary>
   </component>
+  <component name="SbtLocalSettings">
+    <option name="lastUpdateTimestamp" value="1500868273966" />
+    <option name="externalProjectsViewState">
+      <projects_view />
+    </option>
+  </component>
   <component name="ShelveChangesManager" show_recycled="false">
     <option name="remove_strategy" value="false" />
   </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="9a8d58c0-3b05-4264-87e9-ddb2f0e187c5" name="Default" comment="" />
+      <created>1500868261705</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1500868261705</updated>
+      <workItem from="1500868263266" duration="684000" />
+      <workItem from="1500869075625" duration="115000" />
+      <workItem from="1500947742119" duration="2219000" />
+    </task>
+    <servers />
+  </component>
   <component name="TestHistory">
-    <history-entry file="DiamondPrinterTest - 2017.07.23 at 22h 12m 34s.xml">
+    <history-entry file="DiamondPrinterTest - 2017.07.24 at 22h 59m 48s.xml">
       <configuration name="DiamondPrinterTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="DiamondPrinterTest - 2017.07.23 at 22h 12m 54s.xml">
+    <history-entry file="DiamondPrinterTest - 2017.07.24 at 23h 00m 18s.xml">
+      <configuration name="DiamondPrinterTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="DiamondPrinterTest - 2017.07.24 at 23h 00m 36s.xml">
+      <configuration name="DiamondPrinterTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="DiamondPrinterTest - 2017.07.24 at 23h 00m 44s.xml">
+      <configuration name="DiamondPrinterTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="DiamondPrinterTest - 2017.07.24 at 23h 00m 58s.xml">
+      <configuration name="DiamondPrinterTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="DiamondPrinterTest - 2017.07.24 at 23h 01m 07s.xml">
+      <configuration name="DiamondPrinterTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="DiamondPrinterTest - 2017.07.24 at 23h 01m 23s.xml">
+      <configuration name="DiamondPrinterTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="DiamondPrinterTest - 2017.07.24 at 23h 01m 30s.xml">
+      <configuration name="DiamondPrinterTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="DiamondPrinterTest - 2017.07.24 at 23h 02m 30s.xml">
+      <configuration name="DiamondPrinterTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="DiamondPrinterTest - 2017.07.24 at 23h 02m 36s.xml">
       <configuration name="DiamondPrinterTest" configurationId="JUnit" />
     </history-entry>
   </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="3018000" />
+  </component>
   <component name="ToolWindowManager">
-    <frame x="-9" y="-9" width="2578" height="1408" extended-state="0" />
-    <editor active="true" />
+    <frame x="0" y="0" width="2552" height="1390" extended-state="0" />
     <layout>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32938388" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32938388" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24980392" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -606,7 +587,61 @@
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/test/kotlin/DiamondPrinterTest.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="338">
+        <state relative-caret-position="286">
+          <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/kotlin/DiamondPrinter.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="3" column="5" lean-forward="false" selection-start-line="3" selection-start-column="5" selection-end-line="3" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="0">
+            <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/kotlin/DiamondPrinterTest.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/kotlin/DiamondPrinter.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="3" column="5" lean-forward="false" selection-start-line="3" selection-start-column="5" selection-end-line="3" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="0">
+            <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/kotlin/DiamondPrinterTest.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
           <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
           <folding />
         </state>
@@ -614,12 +649,39 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/kotlin/DiamondPrinter.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="78">
+        <state relative-caret-position="66">
           <caret line="3" column="5" lean-forward="false" selection-start-line="3" selection-start-column="5" selection-end-line="3" selection-end-column="5" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/kotlin/DiamondPrinterTest.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="248">
+          <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="0">
+            <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/kotlin/DiamondPrinter.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="13" column="41" lean-forward="true" selection-start-line="13" selection-start-column="41" selection-end-line="13" selection-end-column="41" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/kotlin/diamond/out/production/classes/DiamondPrinter.class b/kotlin/diamond/out/production/classes/DiamondPrinter.class
index bd46358..29bfe55 100644
Binary files a/kotlin/diamond/out/production/classes/DiamondPrinter.class and b/kotlin/diamond/out/production/classes/DiamondPrinter.class differ
diff --git a/kotlin/diamond/src/main/kotlin/DiamondPrinter.kt b/kotlin/diamond/src/main/kotlin/DiamondPrinter.kt
index 89ae0a4..7be6d6b 100644
--- a/kotlin/diamond/src/main/kotlin/DiamondPrinter.kt
+++ b/kotlin/diamond/src/main/kotlin/DiamondPrinter.kt
@@ -1,5 +1,24 @@
 class DiamondPrinter {
-    fun printToList(inp_char: Char): List<String> {
-        return listOf("A")
+    fun printToList(inpChar: Char): List<String> {
+        val returnList: MutableList<String> = mutableListOf()
+        val charList = CharRange('A', inpChar).toList()
+        val length = charList.size
+        // TODO: Make specific branch for 'A'
+        for (i in 0..length - 1){
+            val testChar: Char = charList[i]
+            val totalLength: Int = (length * 2) - 1
+            val beforeSpaces: Int = length - i
+            val middleSpaces: Int = if (totalLength - ((beforeSpaces * 2) + 1) > 0){
+                totalLength - ((beforeSpaces * 2) + 1)
+            } else {0}
+            val builder = StringBuilder()
+            builder.append(CharArray(beforeSpaces, {' '}))
+                    .append(testChar)
+                    .append(CharArray(middleSpaces, {' '}))
+                    .append(testChar)
+                    .append(CharArray(beforeSpaces, {' '}))
+            returnList.add(String(builder))
+        }
+        return returnList
     }
-}
+}
\ No newline at end of file