diff --git a/show/dance2014/networking.n3 b/show/dance2014/networking.n3
--- a/show/dance2014/networking.n3
+++ b/show/dance2014/networking.n3
@@ -12,5 +12,6 @@ sh:netHome
:oscDmxServer ;
:curveCalc ;
:keyboardComposer ;
+ :subComposer ;
:picamserve ;
:vidref .
diff --git a/show/dance2014/patch-source.n3 b/show/dance2014/patch-source.n3
--- a/show/dance2014/patch-source.n3
+++ b/show/dance2014/patch-source.n3
@@ -49,18 +49,18 @@
[ :name "c40"; :output dmx:c40 ] .
-[ :name "c1"; :output dmx:c1 ] .
-[ :name "c2"; :output dmx:c2 ] .
-[ :name "c3"; :output dmx:c3 ] .
-[ :name "front4-r"; :output dmx:c4 ] .
-[ :name "front5-l"; :output dmx:c5 ] .
-[ :name "sharlyn"; :output dmx:c6 ] .
-[ :name "pool"; :output dmx:c7 ] .
-[ :name "front8-r"; :output dmx:c8 ] .
-[ :name "front9-l"; :output dmx:c9 ] .
-[ :name "front10-r2"; :output dmx:c10 ] .
-[ :name "c11"; :output dmx:c11 ] .
-[ :name "c12"; :output dmx:c12 ] .
+[ :name "f1-blue"; :output dmx:c1 ] .
+[ :name "f2"; :output dmx:c2 ] .
+[ :name "f3"; :output dmx:c3 ] .
+[ :name "f4-pool-l"; :output dmx:c4 ] .
+[ :name "f5-fill"; :output dmx:c5 ] .
+[ :name "sharlyn"; :output dmx:c6 ] .
+[ :name "f7"; :output dmx:c7 ] .
+[ :name "f8-fill"; :output dmx:c8 ] .
+[ :name "f9-pool-r"; :output dmx:c9 ] .
+[ :name "f10"; :output dmx:c10 ] .
+[ :name "f11-blue"; :output dmx:c11 ] .
+[ :name "f12-purp"; :output dmx:c12 ] .
[ :name ""; :output dmx:c13 ] .
[ :name "blacklight"; :output dmx:c14 ] .
diff --git a/show/dance2014/snapshots.n3 b/show/dance2014/snapshots.n3
--- a/show/dance2014/snapshots.n3
+++ b/show/dance2014/snapshots.n3
@@ -7,5 +7,9 @@
ns2:image .
+ ns2:image .
+
ns1:created "2014-06-13T22:47:05.828915-07:00"^^xsd:dateTime .
+ ns1:created "2014-06-14T17:42:03.929240-07:00"^^xsd:dateTime .
+
diff --git a/show/dance2014/song10.n3 b/show/dance2014/song10.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2014/song10.n3
@@ -0,0 +1,22 @@
+@prefix ns1: .
+@prefix rdf: .
+@prefix rdfs: .
+@prefix xml: .
+@prefix xsd: .
+
+ ns1:curve ;
+ ns1:effect .
+
+ a ns1:Curve ;
+ rdfs:label "black" .
+
+ a ns1:Effect,
+ ;
+ rdfs:label "blacklight" ;
+ ns1:code "env = 0* + 1",
+ "out = [env * p1, env * p2, env * p3, env * p4]",
+ "p1 = env * * .5",
+ "p2 = Strip.solid('R', (0,0,1))",
+ "p3 = Strip.solid('L', (0,0,1))",
+ "p4 = Blacklight(1)" .
+
diff --git a/show/dance2014/song10/curve-1.n3 b/show/dance2014/song10/curve-1.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2014/song10/curve-1.n3
@@ -0,0 +1,8 @@
+@prefix ns1: .
+@prefix rdf: .
+@prefix rdfs: .
+@prefix xml: .
+@prefix xsd: .
+
+ ns1:points "0 0 0 0 179.4 0" .
+
diff --git a/show/dance2014/song17.n3 b/show/dance2014/song17.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2014/song17.n3
@@ -0,0 +1,16 @@
+@prefix ns1: .
+@prefix rdf: .
+@prefix rdfs: .
+@prefix xml: .
+@prefix xsd: .
+
+ ns1:curve ;
+ ns1:effect .
+
+ a ns1:Curve ;
+ rdfs:label "sub patio" .
+
+ a ns1:Effect ;
+ rdfs:label "sub patio" ;
+ ns1:code "out = * " .
+
diff --git a/show/dance2014/song17/curve-1.n3 b/show/dance2014/song17/curve-1.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2014/song17/curve-1.n3
@@ -0,0 +1,8 @@
+@prefix ns1: .
+@prefix rdf: .
+@prefix rdfs: .
+@prefix xml: .
+@prefix xsd: .
+
+ ns1:points "0 0 147 0.08383 147.9 0.3293 148.7 0.6228 149.4 0.7006 150.5 0.7545 151.3 0.7784 154.3 0.7605 162.6 0.7485 165.7 0.7485 166.7 0.7246 167.4 0.6527 168.2 0.5808 170.1 0.4311 173.8 0.2575 175.5 0.1737 176.4 0.07784" .
+
diff --git a/show/dance2014/sub/fronts.n3 b/show/dance2014/sub/fronts.n3
--- a/show/dance2014/sub/fronts.n3
+++ b/show/dance2014/sub/fronts.n3
@@ -6,10 +6,20 @@
a ns1:Submaster ;
rdfs:label "fronts" ;
- ns1:lightLevel
+ ns1:lightLevel ,
+ ,
+ ,
+ ,
,
+ ,
+ ,
+ ,
+ ,
,
,
+ ,
+ ,
+ ,
,
,
,
@@ -18,10 +28,42 @@
,
.
+ a ns1:ChannelSetting ;
+ ns1:channel ;
+ ns1:level 1e+00 .
+
+ a ns1:ChannelSetting ;
+ ns1:channel ;
+ ns1:level 1e+00 .
+
+ a ns1:ChannelSetting ;
+ ns1:channel ;
+ ns1:level 1e+00 .
+
+ a ns1:ChannelSetting ;
+ ns1:channel ;
+ ns1:level 1e+00 .
+
a ns1:ChannelSetting ;
ns1:channel ;
ns1:level 1e+00 .
+ a ns1:ChannelSetting ;
+ ns1:channel ;
+ ns1:level 1e+00 .
+
+ a ns1:ChannelSetting ;
+ ns1:channel ;
+ ns1:level 1e+00 .
+
+ a ns1:ChannelSetting ;
+ ns1:channel ;
+ ns1:level 1e+00 .
+
+ a ns1:ChannelSetting ;
+ ns1:channel ;
+ ns1:level 1e+00 .
+
a ns1:ChannelSetting ;
ns1:channel ;
ns1:level 1e+00 .
@@ -30,6 +72,18 @@
ns1:channel ;
ns1:level 1e+00 .
+ a ns1:ChannelSetting ;
+ ns1:channel ;
+ ns1:level 1e+00 .
+
+ a ns1:ChannelSetting ;
+ ns1:channel ;
+ ns1:level 1e+00 .
+
+ a ns1:ChannelSetting ;
+ ns1:channel ;
+ ns1:level 1e+00 .
+
a ns1:ChannelSetting ;
ns1:channel ;
ns1:level 1e+00 .
diff --git a/show/dance2014/sub/patio.n3 b/show/dance2014/sub/patio.n3
new file mode 100644
--- /dev/null
+++ b/show/dance2014/sub/patio.n3
@@ -0,0 +1,19 @@
+@prefix ns1: .
+@prefix rdf: .
+@prefix rdfs: .
+@prefix xml: .
+@prefix xsd: .
+
+ a ns1:Submaster ;
+ rdfs:label "patio" ;
+ ns1:lightLevel ,
+ .
+
+ a ns1:ChannelSetting ;
+ ns1:channel ;
+ ns1:level 6.1e-01 .
+
+ a ns1:ChannelSetting ;
+ ns1:channel ;
+ ns1:level 1e+00 .
+