diff --git a/DiveRunner.sln b/DiveRunner.sln
index f06c269..ffc0b8b 100644
--- a/DiveRunner.sln
+++ b/DiveRunner.sln
@@ -1,13 +1,14 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2036
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29009.5
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiveRunner", "DiveRunner\DiveRunner.csproj", "{74562B77-2C69-41F8-B7E0-9939F5A600BD}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D0613FD3-6112-4BC1-BECA-4821E2E63724}"
 	ProjectSection(SolutionItems) = preProject
-		..\..\divelist.csv = ..\..\divelist.csv
+		DiveRunner\SampleCore.json = DiveRunner\SampleCore.json
+		DiveRunner\SampleCoreWithScores.json = DiveRunner\SampleCoreWithScores.json
 	EndProjectSection
 EndProject
 Global
diff --git a/DiveRunner/DiveRunner.csproj b/DiveRunner/DiveRunner.csproj
index 3f015f7..7a6a9fb 100644
--- a/DiveRunner/DiveRunner.csproj
+++ b/DiveRunner/DiveRunner.csproj
@@ -187,6 +187,12 @@
     <None Include="ResultsTemplate.tex">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SampleCore.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="SampleCoreWithScores.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
diff --git a/DiveRunner/SampleCore.json b/DiveRunner/SampleCore.json
new file mode 100644
index 0000000..2ba7443
--- /dev/null
+++ b/DiveRunner/SampleCore.json
@@ -0,0 +1 @@
+{"events":[{"name":"Boys 11 to 12","divers":[{"currentDive":0,"Name":"Gerald Ford","EventName":"Boys 11 to 12","Board":"1M","Dives":[{"Code":"101C","Board":"1M","Description":"Forward Dive Tuck","DD":1.2,"DiveData":"101C,1M,Forward Dive Tuck,1.20"},{"Code":"202C","Board":"1M","Description":"Back 1 Somersault Tuck","DD":1.5,"DiveData":"202C,1M,Back 1 Somersault Tuck,1.50"},{"Code":"302C","Board":"1M","Description":"Reverse 1 Somersault Tuck","DD":1.6,"DiveData":"302C,1M,Reverse 1 Somersault Tuck,1.60"}],"Scores":[],"SubScores":null,"TotalScore":0.0,"Pdf":"null","Place":0,"dirname":"pdfs"},{"currentDive":0,"Name":"Boy Staunton","EventName":"Boys 11 to 12","Board":"1M","Dives":[{"Code":"101C","Board":"1M","Description":"Forward Dive Tuck","DD":1.2,"DiveData":"101C,1M,Forward Dive Tuck,1.20"},{"Code":"202C","Board":"1M","Description":"Back 1 Somersault Tuck","DD":1.5,"DiveData":"202C,1M,Back 1 Somersault Tuck,1.50"},{"Code":"302C","Board":"1M","Description":"Reverse 1 Somersault Tuck","DD":1.6,"DiveData":"302C,1M,Reverse 1 Somersault Tuck,1.60"}],"Scores":[],"SubScores":null,"TotalScore":0.0,"Pdf":"null","Place":0,"dirname":"pdfs"},{"currentDive":0,"Name":"Gerald Ford Numero Dos","EventName":"Boys 11 to 12","Board":"1M","Dives":[{"Code":"101C","Board":"1M","Description":"Forward Dive Tuck","DD":1.2,"DiveData":"101C,1M,Forward Dive Tuck,1.20"},{"Code":"202C","Board":"1M","Description":"Back 1 Somersault Tuck","DD":1.5,"DiveData":"202C,1M,Back 1 Somersault Tuck,1.50"},{"Code":"302C","Board":"1M","Description":"Reverse 1 Somersault Tuck","DD":1.6,"DiveData":"302C,1M,Reverse 1 Somersault Tuck,1.60"}],"Scores":[],"SubScores":null,"TotalScore":0.0,"Pdf":"null","Place":0,"dirname":"pdfs"},{"currentDive":0,"Name":"Who knows","EventName":"Boys 11 to 12","Board":"1M","Dives":[{"Code":"101C","Board":"1M","Description":"Forward Dive Tuck","DD":1.2,"DiveData":"101C,1M,Forward Dive Tuck,1.20"},{"Code":"202C","Board":"1M","Description":"Back 1 Somersault Tuck","DD":1.5,"DiveData":"202C,1M,Back 1 Somersault Tuck,1.50"},{"Code":"302C","Board":"1M","Description":"Reverse 1 Somersault Tuck","DD":1.6,"DiveData":"302C,1M,Reverse 1 Somersault Tuck,1.60"}],"Scores":[],"SubScores":null,"TotalScore":0.0,"Pdf":"null","Place":0,"dirname":"pdfs"}],"nextDiver":0,"curDiver":{"currentDive":0,"Name":"Gerald Ford","EventName":"Boys 11 to 12","Board":"1M","Dives":[{"Code":"101C","Board":"1M","Description":"Forward Dive Tuck","DD":1.2,"DiveData":"101C,1M,Forward Dive Tuck,1.20"},{"Code":"202C","Board":"1M","Description":"Back 1 Somersault Tuck","DD":1.5,"DiveData":"202C,1M,Back 1 Somersault Tuck,1.50"},{"Code":"302C","Board":"1M","Description":"Reverse 1 Somersault Tuck","DD":1.6,"DiveData":"302C,1M,Reverse 1 Somersault Tuck,1.60"}],"Scores":[],"SubScores":null,"TotalScore":0.0,"Pdf":"null","Place":0,"dirname":"pdfs"},"Board":"1M","completedDives":0,"at":0,"dirname":"pdfs"},{"name":"Girls Five to eleven","divers":[{"currentDive":0,"Name":"Girl Boy","EventName":"Girls Five to eleven","Board":"3M","Dives":[{"Code":"102C","Board":"3M","Description":"Forward 1 Somersault Tuck","DD":1.5,"DiveData":"102C,3M,Forward 1 Somersault Tuck,1.50"},{"Code":"201C","Board":"3M","Description":"Back Dive Tuck","DD":1.7,"DiveData":"201C,3M,Back Dive Tuck,1.70"}],"Scores":[],"SubScores":null,"TotalScore":0.0,"Pdf":"null","Place":0,"dirname":"pdfs"},{"currentDive":0,"Name":"Hello World","EventName":"Girls Five to eleven","Board":"3M","Dives":[{"Code":"201B","Board":"3M","Description":"Back Dive Pike","DD":1.8,"DiveData":"201B,3M,Back Dive Pike,1.80"},{"Code":"301C","Board":"3M","Description":"Reverse Dive Tuck","DD":1.8,"DiveData":"301C,3M,Reverse Dive Tuck,1.80"}],"Scores":[],"SubScores":null,"TotalScore":0.0,"Pdf":"null","Place":0,"dirname":"pdfs"}],"nextDiver":0,"curDiver":{"currentDive":0,"Name":"Girl Boy","EventName":"Girls Five to eleven","Board":"3M","Dives":[{"Code":"102C","Board":"3M","Description":"Forward 1 Somersault Tuck","DD":1.5,"DiveData":"102C,3M,Forward 1 Somersault Tuck,1.50"},{"Code":"201C","Board":"3M","Description":"Back Dive Tuck","DD":1.7,"DiveData":"201C,3M,Back Dive Tuck,1.70"}],"Scores":[],"SubScores":null,"TotalScore":0.0,"Pdf":"null","Place":0,"dirname":"pdfs"},"Board":"3M","completedDives":0,"at":0,"dirname":"pdfs"}],"curEvent":0,"curDiver":0,"totalDives":0,"completedDives":0}
\ No newline at end of file
diff --git a/DiveRunner/SampleCoreWithScores.json b/DiveRunner/SampleCoreWithScores.json
new file mode 100644
index 0000000..c30903d
--- /dev/null
+++ b/DiveRunner/SampleCoreWithScores.json
@@ -0,0 +1 @@
+{"events":[{"name":"Boys 11 to 12","divers":[{"currentDive":3,"Name":"Boy Staunton","EventName":"Boys 11 to 12","Board":"1M","Dives":[{"Code":"101C","Board":"1M","Description":"Forward Dive Tuck","DD":1.2,"DiveData":"101C,1M,Forward Dive Tuck,1.20"},{"Code":"202C","Board":"1M","Description":"Back 1 Somersault Tuck","DD":1.5,"DiveData":"202C,1M,Back 1 Somersault Tuck,1.50"},{"Code":"302C","Board":"1M","Description":"Reverse 1 Somersault Tuck","DD":1.6,"DiveData":"302C,1M,Reverse 1 Somersault Tuck,1.60"}],"Scores":[[5.0,5.0,5.0],[5.0,5.0,5.0],[5.0,5.0,5.0]],"SubScores":[[15.0,18.0],[15.0,22.5],[15.0,24.0]],"TotalScore":64.5,"Pdf":"pdfs/BoyStaunton-1M.pdf","Place":1,"dirname":"pdfs"},{"currentDive":0,"Name":"Gerald Ford","EventName":"Boys 11 to 12","Board":"1M","Dives":[{"Code":"101C","Board":"1M","Description":"Forward Dive Tuck","DD":1.2,"DiveData":"101C,1M,Forward Dive Tuck,1.20"},{"Code":"202C","Board":"1M","Description":"Back 1 Somersault Tuck","DD":1.5,"DiveData":"202C,1M,Back 1 Somersault Tuck,1.50"},{"Code":"302C","Board":"1M","Description":"Reverse 1 Somersault Tuck","DD":1.6,"DiveData":"302C,1M,Reverse 1 Somersault Tuck,1.60"}],"Scores":[[4.0,4.0,4.0],[4.0,4.0,4.0],[4.0,4.0,4.0]],"SubScores":[[12.0,14.399999999999999],[12.0,18.0],[12.0,19.200000000000003]],"TotalScore":51.6,"Pdf":"pdfs/GeraldFord-1M.pdf","Place":2,"dirname":"pdfs"}],"nextDiver":0,"curDiver":{"currentDive":3,"Name":"Boy Staunton","EventName":"Boys 11 to 12","Board":"1M","Dives":[{"Code":"101C","Board":"1M","Description":"Forward Dive Tuck","DD":1.2,"DiveData":"101C,1M,Forward Dive Tuck,1.20"},{"Code":"202C","Board":"1M","Description":"Back 1 Somersault Tuck","DD":1.5,"DiveData":"202C,1M,Back 1 Somersault Tuck,1.50"},{"Code":"302C","Board":"1M","Description":"Reverse 1 Somersault Tuck","DD":1.6,"DiveData":"302C,1M,Reverse 1 Somersault Tuck,1.60"}],"Scores":[[5.0,5.0,5.0],[5.0,5.0,5.0],[5.0,5.0,5.0]],"SubScores":[[15.0,18.0],[15.0,22.5],[15.0,24.0]],"TotalScore":64.5,"Pdf":"pdfs/BoyStaunton-1M.pdf","Place":1,"dirname":"pdfs"},"Board":"1M","completedDives":0,"at":0,"dirname":"pdfs"},{"name":"Girls Five to eleven","divers":[{"currentDive":0,"Name":"Hello World","EventName":"Girls Five to eleven","Board":"3M","Dives":[{"Code":"201B","Board":"3M","Description":"Back Dive Pike","DD":1.8,"DiveData":"201B,3M,Back Dive Pike,1.80"},{"Code":"301C","Board":"3M","Description":"Reverse Dive Tuck","DD":1.8,"DiveData":"301C,3M,Reverse Dive Tuck,1.80"}],"Scores":[[7.0,7.0,7.0],[7.0,7.0,7.0]],"SubScores":null,"TotalScore":0.0,"Pdf":"null","Place":0,"dirname":"pdfs"},{"currentDive":0,"Name":"Girly Boy","EventName":"Girls Five to eleven","Board":"3M","Dives":[{"Code":"102C","Board":"3M","Description":"Forward 1 Somersault Tuck","DD":1.5,"DiveData":"102C,3M,Forward 1 Somersault Tuck,1.50"},{"Code":"201C","Board":"3M","Description":"Back Dive Tuck","DD":1.7,"DiveData":"201C,3M,Back Dive Tuck,1.70"}],"Scores":[[6.0,6.0,6.0],[6.0,6.0,6.0]],"SubScores":null,"TotalScore":0.0,"Pdf":"null","Place":0,"dirname":"pdfs"}],"nextDiver":0,"curDiver":{"currentDive":0,"Name":"Hello World","EventName":"Girls Five to eleven","Board":"3M","Dives":[{"Code":"201B","Board":"3M","Description":"Back Dive Pike","DD":1.8,"DiveData":"201B,3M,Back Dive Pike,1.80"},{"Code":"301C","Board":"3M","Description":"Reverse Dive Tuck","DD":1.8,"DiveData":"301C,3M,Reverse Dive Tuck,1.80"}],"Scores":[[7.0,7.0,7.0],[7.0,7.0,7.0]],"SubScores":null,"TotalScore":0.0,"Pdf":"null","Place":0,"dirname":"pdfs"},"Board":"3M","completedDives":0,"at":0,"dirname":"pdfs"}],"curEvent":0,"curDiver":0,"totalDives":10,"completedDives":10}
\ No newline at end of file