diff --git a/.gradle/2.2/taskArtifacts/cache.properties b/.gradle/2.2/taskArtifacts/cache.properties
deleted file mode 100644
index 5fe0b69..0000000
--- a/.gradle/2.2/taskArtifacts/cache.properties
+++ /dev/null
@@ -1 +0,0 @@
-#Fri Mar 31 21:55:13 EDT 2017
diff --git a/.gradle/2.2/taskArtifacts/cache.properties.lock b/.gradle/2.2/taskArtifacts/cache.properties.lock
deleted file mode 100644
index 32044f7..0000000
Binary files a/.gradle/2.2/taskArtifacts/cache.properties.lock and /dev/null differ
diff --git a/.gradle/2.2/taskArtifacts/fileHashes.bin b/.gradle/2.2/taskArtifacts/fileHashes.bin
deleted file mode 100644
index 0f7e9d1..0000000
Binary files a/.gradle/2.2/taskArtifacts/fileHashes.bin and /dev/null differ
diff --git a/.gradle/2.2/taskArtifacts/fileSnapshots.bin b/.gradle/2.2/taskArtifacts/fileSnapshots.bin
deleted file mode 100644
index 9f9d8c4..0000000
Binary files a/.gradle/2.2/taskArtifacts/fileSnapshots.bin and /dev/null differ
diff --git a/.gradle/2.2/taskArtifacts/outputFileStates.bin b/.gradle/2.2/taskArtifacts/outputFileStates.bin
deleted file mode 100644
index 4e5da54..0000000
Binary files a/.gradle/2.2/taskArtifacts/outputFileStates.bin and /dev/null differ
diff --git a/.gradle/2.2/taskArtifacts/taskArtifacts.bin b/.gradle/2.2/taskArtifacts/taskArtifacts.bin
deleted file mode 100644
index 045fb26..0000000
Binary files a/.gradle/2.2/taskArtifacts/taskArtifacts.bin and /dev/null differ
diff --git a/.idea/modules/farsite_main.iml b/.idea/modules/farsite_main.iml
deleted file mode 100644
index 37c6e62..0000000
--- a/.idea/modules/farsite_main.iml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="farsite:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="1">
-        <option name="compilerInfo">
-          <KotlinCompilerInfo>
-            <option name="compilerSettings">
-              <CompilerSettings />
-            </option>
-            <option name="k2jsCompilerArguments">
-              <K2JSCompilerArguments />
-            </option>
-            <option name="k2jvmCompilerArguments">
-              <K2JVMCompilerArguments />
-            </option>
-            <option name="_commonCompilerArguments">
-              <DummyImpl>
-                <option name="languageVersion" value="1.0" />
-                <option name="apiVersion" value="1.0" />
-                <option name="pluginClasspaths">
-                  <array />
-                </option>
-                <option name="coroutinesWarn" value="true" />
-                <option name="pluginOptions">
-                  <array />
-                </option>
-              </DummyImpl>
-            </option>
-          </KotlinCompilerInfo>
-        </option>
-        <option name="useProjectSettings" value="false" />
-        <option name="versionInfo">
-          <KotlinVersionInfo>
-            <option name="apiLevel" value="1.0" />
-            <option name="languageLevel" value="1.0" />
-            <option name="targetPlatformName" value="JVM 1.8" />
-          </KotlinVersionInfo>
-        </option>
-      </configuration>
-    </facet>
-    <facet type="jpa" name="JPA">
-      <configuration>
-        <setting name="validation-enabled" value="true" />
-        <setting name="provider-name" value="" />
-        <datasource-mapping>
-          <factory-entry name="employee" />
-        </datasource-mapping>
-        <deploymentDescriptor name="persistence.xml" url="file://$MODULE_DIR$/../../src/main/resources/META-INF/persistence.xml" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/../../build/classes/main" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../src/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.10" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.guava:guava:21.0" level="project" />
-    <orderEntry type="library" name="Gradle: joda-time:joda-time:2.9.9" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.rholder.fauxflake:fauxflake-core:1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.projectlombok:lombok:1.16.16" level="project" />
-    <orderEntry type="library" name="Gradle: org.postgresql:postgresql:42.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.eclipse.persistence:eclipselink:2.6.4" level="project" />
-    <orderEntry type="library" name="Gradle: org.eclipse.persistence:javax.persistence:2.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.eclipse.persistence:org.eclipse.persistence.jpa:2.6.4" level="project" />
-    <orderEntry type="library" name="Gradle: io.dropwizard.metrics:metrics-core:3.2.2" level="project" />
-    <orderEntry type="library" name="Gradle: io.dropwizard.metrics:metrics-jvm:3.2.2" level="project" />
-    <orderEntry type="library" name="Gradle: io.dropwizard.metrics:metrics-healthchecks:3.2.2" level="project" />
-    <orderEntry type="library" name="Gradle: io.dropwizard.metrics:metrics-graphite:3.2.2" level="project" />
-    <orderEntry type="library" name="Gradle: io.riemann:metrics3-riemann-reporter:0.4.3" level="project" />
-    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:log4j-over-slf4j:1.7.25" level="project" />
-    <orderEntry type="library" name="Gradle: org.zalando:logbook-core:1.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.javafaker:javafaker:0.13" level="project" />
-    <orderEntry type="library" name="Gradle: org.eclipse.persistence:commonj.sdo:2.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Gradle: org.glassfish:javax.json:1.0.4" level="project" />
-    <orderEntry type="library" name="Gradle: org.eclipse.persistence:org.eclipse.persistence.asm:2.6.4" level="project" />
-    <orderEntry type="library" name="Gradle: org.eclipse.persistence:org.eclipse.persistence.antlr:2.6.4" level="project" />
-    <orderEntry type="library" name="Gradle: org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:2.6.4" level="project" />
-    <orderEntry type="library" name="Gradle: org.eclipse.persistence:org.eclipse.persistence.core:2.6.4" level="project" />
-    <orderEntry type="library" name="Gradle: com.codahale.metrics:metrics-core:3.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.riemann:riemann-java-client:0.4.3" level="project" />
-    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.zalando:logbook-api:1.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.stephenc.jcip:jcip-annotations:1.0-1" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:3.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.gag:gag:1.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.5" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.mifmif:generex:1.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.protobuf:protobuf-java:2.6.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.netty:netty:3.6.1.Final" level="project" />
-    <orderEntry type="library" name="Gradle: dk.brics.automaton:automaton:1.11-8" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/farsite_test.iml b/.idea/modules/farsite_test.iml
deleted file mode 100644
index d09bb0b..0000000
--- a/.idea/modules/farsite_test.iml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="farsite:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="1">
-        <option name="compilerInfo">
-          <KotlinCompilerInfo>
-            <option name="compilerSettings">
-              <CompilerSettings />
-            </option>
-            <option name="k2jsCompilerArguments">
-              <K2JSCompilerArguments />
-            </option>
-            <option name="k2jvmCompilerArguments">
-              <K2JVMCompilerArguments />
-            </option>
-            <option name="_commonCompilerArguments">
-              <DummyImpl>
-                <option name="languageVersion" value="1.0" />
-                <option name="apiVersion" value="1.0" />
-                <option name="pluginClasspaths">
-                  <array />
-                </option>
-                <option name="coroutinesWarn" value="true" />
-                <option name="pluginOptions">
-                  <array />
-                </option>
-              </DummyImpl>
-            </option>
-          </KotlinCompilerInfo>
-        </option>
-        <option name="useProjectSettings" value="false" />
-        <option name="versionInfo">
-          <KotlinVersionInfo>
-            <option name="apiLevel" value="1.0" />
-            <option name="languageLevel" value="1.0" />
-            <option name="targetPlatformName" value="JVM 1.8" />
-          </KotlinVersionInfo>
-        </option>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../src/test">
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" type="java-test-resource" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="farsite_main" />
-    <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.10" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.guava:guava:21.0" level="project" />
-    <orderEntry type="library" name="Gradle: joda-time:joda-time:2.9.9" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.rholder.fauxflake:fauxflake-core:1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.projectlombok:lombok:1.16.16" level="project" />
-    <orderEntry type="library" name="Gradle: org.postgresql:postgresql:42.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.eclipse.persistence:eclipselink:2.6.4" level="project" />
-    <orderEntry type="library" name="Gradle: org.eclipse.persistence:javax.persistence:2.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.eclipse.persistence:org.eclipse.persistence.jpa:2.6.4" level="project" />
-    <orderEntry type="library" name="Gradle: io.dropwizard.metrics:metrics-core:3.2.2" level="project" />
-    <orderEntry type="library" name="Gradle: io.dropwizard.metrics:metrics-jvm:3.2.2" level="project" />
-    <orderEntry type="library" name="Gradle: io.dropwizard.metrics:metrics-healthchecks:3.2.2" level="project" />
-    <orderEntry type="library" name="Gradle: io.dropwizard.metrics:metrics-graphite:3.2.2" level="project" />
-    <orderEntry type="library" name="Gradle: io.riemann:metrics3-riemann-reporter:0.4.3" level="project" />
-    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:log4j-over-slf4j:1.7.25" level="project" />
-    <orderEntry type="library" name="Gradle: org.zalando:logbook-core:1.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.javafaker:javafaker:0.13" level="project" />
-    <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Gradle: org.mockito:mockito-all:1.10.19" level="project" />
-    <orderEntry type="library" name="Gradle: org.assertj:assertj-core:2.6.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.stefanbirkner:system-rules:1.16.1" level="project" />
-    <orderEntry type="library" name="Gradle: nl.jqno.equalsverifier:equalsverifier:1.7.8" level="project" />
-    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.quicktheories:quicktheories:0.13" level="project" />
-    <orderEntry type="library" name="Gradle: org.eclipse.persistence:commonj.sdo:2.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" name="Gradle: org.glassfish:javax.json:1.0.4" level="project" />
-    <orderEntry type="library" name="Gradle: org.eclipse.persistence:org.eclipse.persistence.asm:2.6.4" level="project" />
-    <orderEntry type="library" name="Gradle: org.eclipse.persistence:org.eclipse.persistence.antlr:2.6.4" level="project" />
-    <orderEntry type="library" name="Gradle: org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:2.6.4" level="project" />
-    <orderEntry type="library" name="Gradle: org.eclipse.persistence:org.eclipse.persistence.core:2.6.4" level="project" />
-    <orderEntry type="library" name="Gradle: com.codahale.metrics:metrics-core:3.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.riemann:riemann-java-client:0.4.3" level="project" />
-    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.zalando:logbook-api:1.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.stephenc.jcip:jcip-annotations:1.0-1" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:3.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.gag:gag:1.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.5" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.mifmif:generex:1.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.protobuf:protobuf-java:2.6.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.netty:netty:3.6.1.Final" level="project" />
-    <orderEntry type="library" name="Gradle: dk.brics.automaton:automaton:1.11-8" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
-  </component>
-  <component name="TestModuleProperties" production-module="farsite_main" />
-</module>
\ No newline at end of file
diff --git a/farsite.iws b/farsite.iws
index 7702e6a..62d57db 100644
--- a/farsite.iws
+++ b/farsite.iws
@@ -2135,7 +2135,7 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1491013016028</updated>
-      <workItem from="1491013017112" duration="41164000" />
+      <workItem from="1491013017112" duration="41355000" />
     </task>
     <servers />
   </component>
@@ -2157,7 +2157,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="41164000" />
+    <option name="totallyTimeSpent" value="41355000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="2560" height="1440" extended-state="0" />
@@ -2176,7 +2176,7 @@
       <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="8" 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="10" 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="Debug" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.73138684" sideWeight="0.49841017" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.73138684" sideWeight="0.49841017" order="10" 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="13" 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.32919708" sideWeight="0.5" order="2" 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" />