diff --git a/2-4_marches/mackenzie_highlanders/drums.ly b/2-4_marches/mackenzie_highlanders/drums.ly
index 9c19a3e..e7bff8e 100644
--- a/2-4_marches/mackenzie_highlanders/drums.ly
+++ b/2-4_marches/mackenzie_highlanders/drums.ly
@@ -22,8 +22,8 @@
 				}%Format
 				{
 				 \snareA s8
-				 \snareB 
-				 \snareB
+				 \snareBA 
+				 \snareBB
 				}%Music
 			>>
 		}
diff --git a/2-4_marches/mackenzie_highlanders/full.alt.ly b/2-4_marches/mackenzie_highlanders/full.alt.ly
index deb612a..398e975 100644
--- a/2-4_marches/mackenzie_highlanders/full.alt.ly
+++ b/2-4_marches/mackenzie_highlanders/full.alt.ly
@@ -40,9 +40,9 @@
 
 			\snareA s8
 		
-			\snareBA
+			\snareB
 		
-			\snareBB
+			\snareB
 
 		}
 		\new PipeBandDrumStaff = "tenor" {
diff --git a/2-4_marches/mackenzie_highlanders/full.ly b/2-4_marches/mackenzie_highlanders/full.ly
index 705c23c..5c61279 100644
--- a/2-4_marches/mackenzie_highlanders/full.ly
+++ b/2-4_marches/mackenzie_highlanders/full.ly
@@ -3,7 +3,7 @@
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
-\include "notes.side.alt.ily"
+\include "notes.side.ily"
 \include "notes.pipes.ily"
 
 \score {
diff --git a/2-4_marches/mackenzie_highlanders/notes.side.ily b/2-4_marches/mackenzie_highlanders/notes.side.ily
index 32218db..a3aded6 100644
--- a/2-4_marches/mackenzie_highlanders/notes.side.ily
+++ b/2-4_marches/mackenzie_highlanders/notes.side.ily
@@ -1,7 +1,7 @@
 % 2/4 MacKenzie Highlanders
 % Snare
 \version "2.18.2"
-composerSide = "alternate version"
+composerSide = "v1.1"
 sideglobal = { \eighthBeaming }
 %%music
 snareA = \drummode {
@@ -9,8 +9,8 @@ snareA = \drummode {
 	g8) \tuplet 3/2 { d16 g d } 	\flam g16. d32-> g16. g32 |
 	\flam d8 d8:32(	g8:32) d16. g32 |
 
-	d8:32( g16.) g32->	d32 g d g-> d16.-> g32 |
-	d8:64(-> g32) d g d	g8 d8:32( |
+	d8:32( g16.) g32->	d32 g d g-> d8-> |
+	d4:32(\<	d8)\! d8:32( |
 
 	g8) \tuplet 3/2 { d16 g d }	\flam g16. d32-> g16. g32 |
 	d8-> g8:32(->	d8:32)(-> \tuplet 3/2 { g16) d g } |
@@ -24,8 +24,8 @@ snareBA = \drummode {
 	d8:32( \tuplet 3/2 { g16) d g-> }	d16.-> g32-> d32 g d g-> |
 	d8-> d8:32(	g8) d16. g32 |
 
-	d8:32( g16.) g32-> d32 g d g-> d16.-> g32 |
-	d8:64(-> g32) d g d	g8 g8-> |
+	d8:32( g16.) g32-> d32 g d g-> d8-> |
+	d4:32(\<	d8)\! g8-> |
 
 	d8:32( \tuplet 3/2 { g16) d g-> }	d16.-> g32-> d32 g d g-> |
 	d8-> g8:32(->	d8:32)(-> \tuplet 3/2{ g16) d g } |
@@ -37,7 +37,7 @@ snareBB = \drummode {
 	d8:32( \tuplet 3/2 { g16) d g-> }	d16.-> g32-> d32 g d g-> |
 	d8-> d8:32(	g8) d16. g32 |
 
-	d8:32( g16.) g32-> d32 g d g-> d16.-> g32 |
+	d8:32( g16.) g32-> d32 g d g-> d8-> |
 	\flam d4	d8:32(-> \< g8:32)(-> |
 
 	d8)-> \! \tuplet 3/2 { g16 d g-> }	d8:32(-> \tuplet 3/2 { g16) d g-> }
diff --git a/2-4_marches/mackenzie_highlanders/notes.side.v1.0.ily b/2-4_marches/mackenzie_highlanders/notes.side.v1.0.ily
new file mode 100644
index 0000000..32218db
--- /dev/null
+++ b/2-4_marches/mackenzie_highlanders/notes.side.v1.0.ily
@@ -0,0 +1,48 @@
+% 2/4 MacKenzie Highlanders
+% Snare
+\version "2.18.2"
+composerSide = "alternate version"
+sideglobal = { \eighthBeaming }
+%%music
+snareA = \drummode {
+	d8:32( |
+	g8) \tuplet 3/2 { d16 g d } 	\flam g16. d32-> g16. g32 |
+	\flam d8 d8:32(	g8:32) d16. g32 |
+
+	d8:32( g16.) g32->	d32 g d g-> d16.-> g32 |
+	d8:64(-> g32) d g d	g8 d8:32( |
+
+	g8) \tuplet 3/2 { d16 g d }	\flam g16. d32-> g16. g32 |
+	d8-> g8:32(->	d8:32)(-> \tuplet 3/2 { g16) d g } |
+
+	d8[-> \drag d16 d32-> g]	d[ g \drag d16 d16. g32] |
+	d4:32(	d8)
+}
+% Part 2
+snareBA = \drummode {
+	g8 |
+	d8:32( \tuplet 3/2 { g16) d g-> }	d16.-> g32-> d32 g d g-> |
+	d8-> d8:32(	g8) d16. g32 |
+
+	d8:32( g16.) g32-> d32 g d g-> d16.-> g32 |
+	d8:64(-> g32) d g d	g8 g8-> |
+
+	d8:32( \tuplet 3/2 { g16) d g-> }	d16.-> g32-> d32 g d g-> |
+	d8-> g8:32(->	d8:32)(-> \tuplet 3/2{ g16) d g } |
+
+	d8[-> \drag d16 d32-> g]	d[ g \drag d16 d16. g32] |
+	d4:32(	d8) g8
+}
+snareBB = \drummode {
+	d8:32( \tuplet 3/2 { g16) d g-> }	d16.-> g32-> d32 g d g-> |
+	d8-> d8:32(	g8) d16. g32 |
+
+	d8:32( g16.) g32-> d32 g d g-> d16.-> g32 |
+	\flam d4	d8:32(-> \< g8:32)(-> |
+
+	d8)-> \! \tuplet 3/2 { g16 d g-> }	d8:32(-> \tuplet 3/2 { g16) d g-> }
+	d32 g d g-> d16.-> g32	d8:32(-> \tuplet 3/2 { g16) d g } |
+
+	d8[-> \drag d16 d32-> g]	d[ g \drag d16 d16. g32] |
+	d4:32( d4)
+}
diff --git a/2-4_marches/point_of_war/config.ily b/2-4_marches/point_of_war/config.ily
new file mode 100644
index 0000000..69daf12
--- /dev/null
+++ b/2-4_marches/point_of_war/config.ily
@@ -0,0 +1,16 @@
+\version "2.19.0"
+%% Globals
+global = {
+	\time 2/4
+	}
+confTempo = { 
+	\tempo 4 = 80 
+	}
+%% Format
+part = { \partial 8 s8 }
+halfline = { \repeat unfold 4 { s1 | } }
+line = { \repeat unfold 2 { \halfline } }
+
+%% Headers
+title = "The Point of War"
+meter = "March"
diff --git a/2-4_marches/point_of_war/notes.pipes.ily b/2-4_marches/point_of_war/notes.pipes.ily
new file mode 100644
index 0000000..66ca861
--- /dev/null
+++ b/2-4_marches/point_of_war/notes.pipes.ily
@@ -0,0 +1,20 @@
+% 2/4 Point of War
+% Pipes
+\version "2.18.2"
+composerPipes = ""
+pipeglobal = {
+	\bagpipeKey
+	}
+% Music
+pipesA = {
+	\grg e16. [ d32 ] |
+	\grg c32 [ d16. ] \grg b32 [ \slurd c16. ] \grg a8 [ A8 ] |
+	f32 [ A16. ] f32 [ A16. ] \hdble e8. [ d16 ] |
+	\grg c32 [ d16. ] \grg b32 [ \slurd c16. ] a8 [ A8 ] |
+	f32 [ A16. ] f32 [ A16. ] \hdble e8 [ \grg f16 g16 ] |
+
+	A16. [ e32 \grg c32 \slurd a16. ] \dblf f8 [ \grg e16 f16 ] |
+	A16. [ f32 ] \grg e16. [ c32 ] \slurd b8 [ \grg e16. d32 ] |
+	\grg c32 [ d16. ] \grg b32 [ \slurd c16. ] a8 [ A16. f32 ] |
+	\grg e16. [ c32 ] \dbld d16. [ b32 ] a8 
+}
diff --git a/2-4_marches/point_of_war/pipes.ly b/2-4_marches/point_of_war/pipes.ly
new file mode 100644
index 0000000..14768d8
--- /dev/null
+++ b/2-4_marches/point_of_war/pipes.ly
@@ -0,0 +1,44 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			{ 
+			\repeat volta 2 {
+				\part
+				\halfline
+				}
+			}%Format
+			{ 
+			 \pipesA
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\partial 8
+		\pipesA
+		\pipesA
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily b/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily
index 7b2a6c6..f39dc33 100644
--- a/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily
+++ b/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily
@@ -1,6 +1,9 @@
 % 3/4 On the Road to Passchendaele
 % Pipes
 \version "2.18.2"
+%If not defined, define rodin here
+rodin = { \bgrip }
+
 composerPipes = "PM Gavin Stoddart MBE BEM / Alan Brydon"
 pipeglobal = {
 	\bagpipeKey
diff --git a/4-4_marches/auld_lang_syne/pipes.ly b/4-4_marches/auld_lang_syne/pipes.ly
index 0793905..63d724f 100644
--- a/4-4_marches/auld_lang_syne/pipes.ly
+++ b/4-4_marches/auld_lang_syne/pipes.ly
@@ -9,8 +9,8 @@
 		\pipeglobal
 		<<
 			{
-			\repeat 2 volta { \part \line }
-			\repeat 2 volta { \line }
+			\repeat volta 2 { \part \line }
+			\repeat volta 2 { \line }
 			}
 			{
 			\pipesA s4
@@ -31,7 +31,12 @@
 		\set Staff.midiInstrument = #"bagpipe"
 		%%Tune
 
-		\repeat volta 2 {
+		\partial 8
+		\pipesA
+		\pipesA
+		
+		\pipesB
+		\pipesB
 	}
 	\midi { \confTempo }
 }
diff --git a/4-4_marches/bonnie_galloway/notes.pipes.ily b/4-4_marches/bonnie_galloway/notes.pipes.ily
index 3178da1..32689f8 100644
--- a/4-4_marches/bonnie_galloway/notes.pipes.ily
+++ b/4-4_marches/bonnie_galloway/notes.pipes.ily
@@ -1,6 +1,8 @@
 % 4/4 Bonnie Galloway>
 % Pipes
 \version "2.18.2"
+
+hvthrwd = { \gripthrwd }
 composerPipes = ""
 pipeglobal = {
 	\bagpipeKey