diff --git a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_01_Aria.ily b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_01_Aria.ily
index 1d9de60cae959f927b7898a47db9b6b0aee59563..9656e8d3618e435498ecb655f90817071da782bd 100644
--- a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_01_Aria.ily
+++ b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_01_Aria.ily
@@ -63,7 +63,7 @@ IAriaVIMusic = \relative c'' {
   f2-| b-| r | % 59
   b,-| c-| g'-| | \barNumberCheck #60
   a, c r | % 61
-  R1.*2 \bar"|."
+  R1.*2 \bar"||"
 }
 \addQuote "IAriaVIMusic" { \IAriaVIMusic }
 
@@ -121,7 +121,7 @@ IAriaVIIMusic = \relative c'' {
   d2-| f-| r | % 59
   g,-| g-| g-| | \barNumberCheck #60
   f f r | % 61
-  R1.*2 \bar"|."
+  R1.*2 \bar"||"
 }
 \addQuote "IAriaVIIMusic" { \IAriaVIIMusic }
 
@@ -178,17 +178,44 @@ IAriaVaMusic = \relative c'' {
   b2-| d-| r | % 59
   es,-| es-| c-| | \barNumberCheck #60
   c a' r | % 61
-  R1.*2 \bar"|."
+  R1.*2 \bar"||"
 }
 \addQuote "IAriaVaMusic" { \IAriaVaMusic }
 
 IAriaTMusic = \relative c' {
-  s8
+  R1.*8 | % 9
+  r2 d1 | \barNumberCheck #10
+  b1 g2 | % 11
+  es'4. d8 c2 a | % 12
+  fis1 g2 | % 13
+  r2 a1 | % 14
+  r2 his1 | % 15
+  c2 d4.(\melisma es8 c4. d8) | % 16
+  es1.~ | % 17
+  es4 c4 d4. es8 f4. es8 | % 18
+  d1.~ | % 19
+  d4 g, a b c2~ | \barNumberCheck #20
+  c4 es d4. c8 b4. a8 | % 21
+  b2.\melismaEnd a4 b g | % 22
+  eis'2. \melisma f4 g4.\melismaEnd eis8 | % 
+  cis1 r2 | % 
+  r2 d1 | % 
+  r2 his4.\melisma c8 a4. his8 | % 
+  c2 d4. es8 c4. d8 | % 
+  es2.\melismaEnd d4 c2~ | % 
+  c4 d4 b2 a4( g) | % 
+  g1 r2 | \barNumberCheck #30
+  R1.*5 |
+  
   % TODO
 }
 \addQuote "IAriaTMusic" { \IAriaTMusic }
 
 IAriaTLyrics = \lyricmode {
+  Ach, Je -- su, Sa -- tans Ü -- ber -- win -- der,
+  "von,(?)" "von,(?)" "von(?)" "sei(?)" -- "ner(?)," sei -- ner Grau -- sam -- keit,
+  von sei -- ner, sei -- ner Grau -- sam -- keit.
+  Dass dort is XXX
   % TODO
 }
 
@@ -257,7 +284,7 @@ IAriaContinuoMusic = \relative c {
   es,4 d c d es c |
   f f a f f f |
   b d, f2 f |
-  b1. \bar "|."
+  b1. \bar "||"
 }
 IAriaVcBMusic = \IAriaContinuoMusic
 \addQuote "IAriaContinuoMusic" { \IAriaContinuoMusic }
diff --git a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_02_Recitativo.ily b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_02_Recitativo.ily
index 5fffececdd6181c117f6bcf5d22b6ae39a6229dc..5f3d5c1c4e69c2f5e7522042e149d21c188f24e3 100644
--- a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_02_Recitativo.ily
+++ b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_02_Recitativo.ily
@@ -33,7 +33,7 @@ IIRecitativoContinuoMusic = \relative c {
   b2~ b |
   c4 f, f'2 |
   d2 g |
-  es-> d \bar"|."
+  es-> d \bar"||"
 }
 IIRecitativoVcBMusic = \IIRecitativoContinuoMusic
 \addQuote "IIRecitativoContinuoMusic" { \IIRecitativoContinuoMusic }
diff --git a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_04_Choral.ily b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_04_Choral.ily
index c5ce9114238fdd1c92467d36c9732cdaebece191..e404e33f6ea2e64c671b06725ae2379307db6810 100644
--- a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_04_Choral.ily
+++ b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_04_Choral.ily
@@ -7,28 +7,104 @@ IVChoralKey = \key b \major
 IVChoralTimeSignature = \time 3/4
 
 IVChoralSettings = \notemode {
+  \override Staff.TimeSignature #'style = #'single-digit
+  \override TupletBracket #'bracket-visibility = ##f
+  \set tupletSpannerDuration = #(ly:make-moment 1 4)
+  \override TupletNumber #'stencil = ##f
 }
 
 
 IVChoralVIMusic = \relative c'' {
-  \times 2/3 { f8[ e d] } \times 2/3 {d[ e f] } \times 2/3 { e[ d c] } | % 2
-  \times 2/3 {d[ c h]} \times 2/3 { h[ c d] } \times 2/3 { c[ h a] } | % 3
-  s8
-  % TODO
+  \times 2/3 { 
+    \repeat volta 2 {
+      f8[( es) d] d[ es f] es[( d) c]  | % 2
+      d[( c) b] b[ c d] c[( b) a]  | % 3
+      b16[( c d es) f8] a,[ c f] b,[( a) b] | % 4
+      c16[( b a g) f8] c'[ d es] d16[( c d es) f8] | % 5
+      g,[ a b] c16[( b a b) c8] f,[ b d] | % 6
+      a8[ f16( g a b]) c8[ d es] d[ c b] | % 7
+      g'[( f) f] g[( f) f] d16[( c d es) f8] | % 8
+      d16[( c d es) f8] a,[ g f] b[ a g] | % 9
+      g'16[( f eis d) c8] c[ eis g] a[ g f] | \barNumberCheck #10
+      d16[( c d eis) f8] b,16[( a b c) d8] g,[ a b] | % 11
+      a[ f f] a[ f f] c'16[( b c d) es8] | % 12
+    }
+    d8[( c) c] d[( c) c] d16[( c d es) f8] | % 13
+    c8[ a16( b c d]) es8[ d c] f[ c f] | % 14
+    f,8[ g16( a b c]) d8[ es f] b,[( a) g] | % 15
+    c16[( d es f) g8] f,16[( g a b) c8] d[ c b] | % 16
+    f'[( eis ) f] f[( eis) f] f[( eis) f] | % 17
+    c16[( b c d) es8] d[ c b] es[ d c] | % 18
+    d16[( c d es) f8] a,[ g f] b16[( a b c) d8] | % 19
+    c8[ a16( b c d)] es8[ d c] f[( es) f] | \barNumberCheck #20
+    d[ d16( c b a]) g8[ a b] a[ c f] | % 21
+    d8[ b16( a b c]) d8[ b16( c d es]) f8[ es d] | % 22
+    g8[( f) f] g[( f) f] g[( f) f] | % 23
+    b,16[( c d es f8]) d[ c b] d8.[( es16) c8] | % 24
+  }
+  b2. \bar "||"
 }
 \addQuote "IVChoralVIMusic" { \IVChoralVIMusic }
 
 
-IVChoralVIIMusic = \relative c' {
-  s8
-  % TODO
+IVChoralVIIMusic = \relative c'' {
+  \repeat volta 2 {
+    d4 r r | % 2
+    \times 2/3 { f8[( es) d] d[ es f] es[( d) c] } | % 3
+    d4 c b | % 4
+    a g f | % 5
+    es'4. g8 d4 | % 6
+    c2 b4 | % 7
+    \times 2/3 { es8[(\p d) d] es[( d) d] b16[( a b c) d8] } | % 8
+    b4\f c b | % 9
+    c4. b8 a4 | \barNumberCheck #10
+    g f eis | % 11
+    f c \times 2/3 { a'16[( g a b) c8] } |  % 12
+  }
+  \times 2/3 { b8[(\p a) a] b[( a) a] b16[( a b c) d8] } | % 13
+  a4\f g f | % 14
+  b b g | % 15
+  es'4. f8 d4 | % 16
+  c2 c4 | % 17
+  \times 2/3 { a16[(\pp g a b) c8] b[( a) g] c[( b) a] | % 18
+    b16[(\f a b c) d8] } c4 b | % 19
+  a4 g f | \barNumberCheck #20
+  d'4. es8 c4 | % 21
+  b f \times 2/3 {d'8[( c) b] | % 22
+    es[(\pp d) d] es[( d) d] es[( d) d] } | % 23
+  f,4\f b a |
+  f2. \bar"||"
 }
 \addQuote "IVChoralVIIMusic" { \IVChoralVIIMusic }
 
 
 IVChoralVaMusic = \relative c' {
-  s8
-  % TODO
+  \repeat volta 2 {
+    b4 r r | % 2
+    R2. | % 3
+    f'4 f eis | % 4
+    c a' b | % 5
+    c, f b, | % 6
+    f' f f | % 7
+    R2. | % 8
+    f4 f d | % 9
+    c g' c, | \barNumberCheck #10
+    b' d, c | % 11
+    c a f | % 12
+  }
+  R2. | % 13
+  f'4 c c' | % 14
+  b f es | % 15
+  g a f | % 16
+  \times 2/3 { a8[( g) a] a[( g) a] a[( g) a] } | % 17
+  R2. | % 18
+  f4 f f | % 19
+  f c' a | \barNumberCheck #20
+  b \times 2/3 {es,8[( f) g] } f4 | % 21
+  f r r | % 22
+  R2. | % 23
+  d4 f f | % 24
+  d2. \bar"||"
 }
 \addQuote "IVChoralVaMusic" { \IVChoralVaMusic }
 
@@ -72,29 +148,29 @@ IVChoralTLyrics = \lyricmode {
 IVChoralContinuoMusic = \relative c' {
   \repeat volta 2 {
     R2.*2 | % 3
-    b4 f g |
-    f f b |
-    c a b |
-    f2 b,4 |
-    R2. |
-    b'4 f g |
-    eis eis f |
-    b b c |
-    f,2. 
+    b4 f g | % 4
+    f f b | % 5
+    c a b | % 6
+    f2 b,4 | % 7
+    R2. | % 8
+    b'4 f g | % 9
+    eis eis f | \barNumberCheck #10
+    b b c | % 11
+    f,2. | % 12
   }
-  R2. |
-  f4 c' a |
-  d d, es |
-  c a' b |
-  f2 f4 |
-  R2. |
-  b4 f d |
-  f c d |
-  b es-> f |
-  b,2. |
-  R2. |
-  d4 b8[ d] f4 |
-  b,2. \bar"|."
+  R2. | % 13
+  f4 c' a | % 14
+  d d, es | % 15
+  c a' b | % 16
+  f2 f4 | % 17
+  R2. | % 18
+  b4 f d | % 19
+  f c d | \barNumberCheck #20
+  b es-> f | % 21
+  b,2. | % 22
+  R2. | % 23
+  d4 b8[ d] f4 | % 24
+  b,2. \bar"||"
 }
 IVChoralVcBMusic = \IVChoralContinuoMusic
 \addQuote "IVChoralContinuoMusic" { \IVChoralContinuoMusic }
diff --git a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_05_Recitativo.ily b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_05_Recitativo.ily
index ce8c89cf1da17ad96d6f69bc7a6bd3411ed21310..903ca479f7b03674cceaf90ba5513f7c6449b4c0 100644
--- a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_05_Recitativo.ily
+++ b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_05_Recitativo.ily
@@ -34,7 +34,7 @@ VRecitativoContinuoMusic = \relative c {
   d g, g'2 |
   cis,1 |
   d2 g~ |
-  g a4 d, \bar"|."
+  g a4 d, \bar"||"
 }
 VRecitativoVcBMusic = \VRecitativoContinuoMusic
 \addQuote "VRecitativoContinuoMusic" { \VRecitativoContinuoMusic }
diff --git a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_06_Aria.ily b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_06_Aria.ily
index 5380024252d13e42feb8bddf9ba6f2cef6a7c0cd..c00b5dbbdda2f9d310a4bf0e5c0cb018de4a75ac 100644
--- a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_06_Aria.ily
+++ b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_06_Aria.ily
@@ -10,23 +10,83 @@ VIAriaSettings = \notemode {
 }
 
 
-VIAriaVIMusic = \relative c' {
-  s8
-  % TODO
+VIAriaVIMusic = \relative c'' {
+  d8[ r g r a, r fes'] r | % 2
+  g,[ r e' r fis, r g] r | % 3
+  c[ r a r b r f] r | % 4
+  g[ r f r g r e'] r | % 5
+  d[ r g r fis r dis] r | % 6
+  e[ r c r c r h] r | % 7
+  c[ r e, r d' r e] r | % 8
+  c[ r e r d r a] r | % 9
+  d[ r h r e r c] r | \barNumberCheck #10
+  h[ r d r c r a] r | % 11
+  d[ r e r c r a] r | % 12
+  h[ r e r d r c] r | % 13
+  h[\fermata r e r e r dis] r | % 14
+  e r r4 r2 | % 15
+  r4 g8[ e] fis[ g a( g16^+) fis] | % 16
+  g8[ e] g r fes r e r | % 17
+  d[ r e r c r fes] r | % 18
+  h, r d r c r fis] r | % 19
+  g[ r e r e r dis] r | \barNumberCheck #20
+  e[ r e] r dis[( e) e( f]) | % 21
+  dis4 r8 b' \grace a8 g8.[^+ fis16] e4 | % 22
+  R1 \bar"||"
 }
 \addQuote "VIAriaVIMusic" { \VIAriaVIMusic }
 
 
-VIAriaVIIMusic = \relative c' {
-  s8
-  % TODO
+VIAriaVIIMusic = \relative c'' {
+  b8[ r b r e, r d] r |
+  d[ r g r d r g] r |
+  g[ r fis r g r d] r |
+  d[ r d r g r g] r |
+  h[ r h r h r h] r |
+  h[ r a r a r g] r |
+  e[ r e r e r h'] r |
+  a[ r c r a r fis] r |
+  gis[ r gis r e r a ] r |
+  e[ r h' r a r fis] r |
+  g[ r g r a r fis] r |
+  g[ r c r h r e,] r |
+  d[\fermata r h' r c r h] r |
+  h r r4 r2 |
+  r4 e2 dis4 |
+  e8[ r e r c r c] r |
+  h[ r g r a r d] r |
+  gis,[ r gis r a r d] r |
+  d[ r h r a r h] r |
+  h[ r c r h r c] r |
+  h[ r dis] r e[ e,] r4 |
+  R1 \bar"||"
 }
 \addQuote "VIAriaVIIMusic" { \VIAriaVIIMusic }
 
 
-VIAriaVaMusic = \relative c' {
-  s8
-  % TODO
+VIAriaVaMusic = \relative c'' {
+  g8 r g, r  c r a r | % 2
+  d r c r a r d r | % 3
+  e r d r d r a r | % 4
+  g r a r e' r c' r | % 5
+  g r g r h, r fis' r | % 6
+  e r e r d r d r | % 7
+  c r c r h r gis' r | % 8
+  e r e r fis r d r | % 9
+  h' r e, r g, r d' r | \barNumberCheck #10
+  gis r gis r e r d r | % 11
+  d r c r e r d r | % 12
+  d r g r g r g r | % 13
+  g\fermata r g r a r a r | % 14
+  g r r4 r2 | % 15
+  r4 h4 c h | % 16
+  h c8 r a r g r | % 17
+  g r c, r fes r h, r | % 18
+  e r d r e r a r | % 19
+  g r h, r f' r f r | \barNumberCheck #20
+  g r g r g r fis r | % 21
+  g r h r h r r4 | % 22
+  R1 \bar"||"
 }
 \addQuote "VIAriaVaMusic" { \VIAriaVaMusic }
 
@@ -64,7 +124,7 @@ VIAriaContinuoMusic = \relative c' {
   g, r g' r f-> r h,-> r |
   e r c r g' r a r |
   h r h, r e r e r |
-  fis4 fis h,2 \bar"|." % TOOD: Da capo!!
+  fis4 fis h,2 \bar"||" % TOOD: Da capo!!
 }
 VIAriaVcBMusic = \VIAriaContinuoMusic
 \addQuote "VIAriaContinuoMusic" { \VIAriaContinuoMusic }
diff --git a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_07_Recitativo.ily b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_07_Recitativo.ily
index 40c41bdfd22ae7ee385126e0e839568276610a6f..035699dc4351da7084275211e2c962559301dc0e 100644
--- a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_07_Recitativo.ily
+++ b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_07_Recitativo.ily
@@ -29,7 +29,7 @@ VIIRecitativoContinuoMusic = \relative c {
   fis~ fis |
   g b |
   c es |
-  d4 g, \bar"|."
+  d4 g, \bar"||"
 }
 VIIRecitativoVcBMusic = \VIIRecitativoContinuoMusic
 \addQuote "VIIRecitativoContinuoMusic" { \VIIRecitativoContinuoMusic }
diff --git a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_08_Choral.ily b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_08_Choral.ily
index 7efa399a940984ba14b955312564e648728273ff..71cfb7cbe819290d04f895e8a99176f4320c9eeb 100644
--- a/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_08_Choral.ily
+++ b/Grauper_AchJesuSatansUeberwinder_GWV1122_Music_08_Choral.ily
@@ -6,14 +6,14 @@ VIIIChoralPieceNameTacet = "8. Choral tacet"
 VIIIChoralKey = \IVChoralKey
 VIIIChoralTimeSignature = \IVChoralTimeSignature
 VIIIChoralSettings = \IVChoralSettings
-VIIIChoralVIMusic = \IVChoralVIMusic
-VIIIChoralVIIMusic = \IVChoralVIIMusic
-VIIIChoralVaMusic = \IVChoralVaMusic
-VIIIChoralSMusic = \IVChoralSMusic
-VIIIChoralSLyrics = \IVChoralSLyrics
-VIIIChoralAMusic = \IVChoralAMusic
-VIIIChoralALyrics = \IVChoralALyrics
-VIIIChoralTMusic = \IVChoralTMusic
-VIIIChoralTLyrics = \IVChoralTLyrics
-VIIIChoralContinuoMusic = \IVChoralContinuoMusic
-VIIIChoralVcBMusic = \IVChoralVcBMusic
+VIIIChoralVIMusic = { \IVChoralVIMusic \bar "|." }
+VIIIChoralVIIMusic = { \IVChoralVIIMusic \bar "|." }
+VIIIChoralVaMusic = { \IVChoralVaMusic \bar "|." }
+VIIIChoralSMusic = { \IVChoralSMusic \bar "|." }
+VIIIChoralSLyrics = { \IVChoralSLyrics \bar "|." }
+VIIIChoralAMusic = { \IVChoralAMusic \bar "|." }
+VIIIChoralALyrics = { \IVChoralALyrics \bar "|." }
+VIIIChoralTMusic = { \IVChoralTMusic \bar "|." }
+VIIIChoralTLyrics = { \IVChoralTLyrics \bar "|." }
+VIIIChoralContinuoMusic = { \IVChoralContinuoMusic \bar "|." }
+VIIIChoralVcBMusic = { \IVChoralVcBMusic \bar "|." }