diff --git a/2-4_marches/barren_rocks_of_aden/pipes.ly b/2-4_marches/barren_rocks_of_aden/pipes.ly
index 29ba2e0..05112aa 100644
--- a/2-4_marches/barren_rocks_of_aden/pipes.ly
+++ b/2-4_marches/barren_rocks_of_aden/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/2-4_marches/black_bear/full.ly b/2-4_marches/black_bear/full.ly
index e9dc6aa..6a174a2 100644
--- a/2-4_marches/black_bear/full.ly
+++ b/2-4_marches/black_bear/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/2-4_marches/black_bear/pipes.ly b/2-4_marches/black_bear/pipes.ly
index aaab560..7bf34b6 100644
--- a/2-4_marches/black_bear/pipes.ly
+++ b/2-4_marches/black_bear/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/2-4_marches/black_bear/side.ly b/2-4_marches/black_bear/side.ly
index 5a9d54a..abea036 100644
--- a/2-4_marches/black_bear/side.ly
+++ b/2-4_marches/black_bear/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/2-4_marches/black_bear/tenor.ly b/2-4_marches/black_bear/tenor.ly
index edf6af8..0651545 100644
--- a/2-4_marches/black_bear/tenor.ly
+++ b/2-4_marches/black_bear/tenor.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.tenor.ily"
 
diff --git a/2-4_marches/brown_haired_maiden/pipes.ly b/2-4_marches/brown_haired_maiden/pipes.ly
index dfb926c..d45487d 100644
--- a/2-4_marches/brown_haired_maiden/pipes.ly
+++ b/2-4_marches/brown_haired_maiden/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/2-4_marches/caller_herrin/pipes.full.ly b/2-4_marches/caller_herrin/pipes.full.ly
index 46b16a3..a7153d8 100644
--- a/2-4_marches/caller_herrin/pipes.full.ly
+++ b/2-4_marches/caller_herrin/pipes.full.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 \include "notes.pipes.seconds.ily"
diff --git a/2-4_marches/caller_herrin/pipes.ly b/2-4_marches/caller_herrin/pipes.ly
index 329939c..63f65ea 100644
--- a/2-4_marches/caller_herrin/pipes.ly
+++ b/2-4_marches/caller_herrin/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/2-4_marches/caller_herrin/pipes.seconds.ly b/2-4_marches/caller_herrin/pipes.seconds.ly
index 0feb548..db4e69c 100644
--- a/2-4_marches/caller_herrin/pipes.seconds.ly
+++ b/2-4_marches/caller_herrin/pipes.seconds.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.seconds.ily"
 
diff --git a/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/pipes.ly b/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/pipes.ly
index 5c085e0..ec629ab 100644
--- a/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/pipes.ly
+++ b/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/2-4_marches/duncan_mcinness/side.ly b/2-4_marches/duncan_mcinness/side.ly
index eb5a099..3d10cf5 100644
--- a/2-4_marches/duncan_mcinness/side.ly
+++ b/2-4_marches/duncan_mcinness/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/2-4_marches/high_road_to_gairloch/pipes.ly b/2-4_marches/high_road_to_gairloch/pipes.ly
index 5f9e301..cb85550 100644
--- a/2-4_marches/high_road_to_gairloch/pipes.ly
+++ b/2-4_marches/high_road_to_gairloch/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/2-4_marches/mackenzie_highlanders/bass.ly b/2-4_marches/mackenzie_highlanders/bass.ly
index dd6a308..e450591 100644
--- a/2-4_marches/mackenzie_highlanders/bass.ly
+++ b/2-4_marches/mackenzie_highlanders/bass.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 
diff --git a/2-4_marches/mackenzie_highlanders/drums.ly b/2-4_marches/mackenzie_highlanders/drums.ly
index e7bff8e..4803437 100644
--- a/2-4_marches/mackenzie_highlanders/drums.ly
+++ b/2-4_marches/mackenzie_highlanders/drums.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 %\include "notes.tenor.ily"
diff --git a/2-4_marches/mackenzie_highlanders/full.ly b/2-4_marches/mackenzie_highlanders/full.ly
index 5c61279..72b09b9 100644
--- a/2-4_marches/mackenzie_highlanders/full.ly
+++ b/2-4_marches/mackenzie_highlanders/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/2-4_marches/mackenzie_highlanders/pipes.ly b/2-4_marches/mackenzie_highlanders/pipes.ly
index b4121b8..69fbd05 100644
--- a/2-4_marches/mackenzie_highlanders/pipes.ly
+++ b/2-4_marches/mackenzie_highlanders/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/2-4_marches/mackenzie_highlanders/side.alt.ly b/2-4_marches/mackenzie_highlanders/side.alt.ly
index baa37b1..e989004 100644
--- a/2-4_marches/mackenzie_highlanders/side.alt.ly
+++ b/2-4_marches/mackenzie_highlanders/side.alt.ly
@@ -1,5 +1,7 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.alt.ily"
 
diff --git a/2-4_marches/mackenzie_highlanders/side.ly b/2-4_marches/mackenzie_highlanders/side.ly
index 339fa90..7e5fcb4 100644
--- a/2-4_marches/mackenzie_highlanders/side.ly
+++ b/2-4_marches/mackenzie_highlanders/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/2-4_marches/mackenzie_highlanders/tenor.alt.ly b/2-4_marches/mackenzie_highlanders/tenor.alt.ly
index 2eb1a52..ded1467 100644
--- a/2-4_marches/mackenzie_highlanders/tenor.alt.ly
+++ b/2-4_marches/mackenzie_highlanders/tenor.alt.ly
@@ -1,5 +1,7 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.tenor.alt.ily"
 
diff --git a/2-4_marches/mackenzie_highlanders/tenor.ly b/2-4_marches/mackenzie_highlanders/tenor.ly
index abb1e08..feb3bfa 100644
--- a/2-4_marches/mackenzie_highlanders/tenor.ly
+++ b/2-4_marches/mackenzie_highlanders/tenor.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.tenor.ily"
 
diff --git a/2-4_marches/mairis_wedding/pipes.ly b/2-4_marches/mairis_wedding/pipes.ly
index f6dea79..8256500 100644
--- a/2-4_marches/mairis_wedding/pipes.ly
+++ b/2-4_marches/mairis_wedding/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/2-4_marches/pipers_cave/pipes.ly b/2-4_marches/pipers_cave/pipes.ly
index 7033850..6b0af3e 100644
--- a/2-4_marches/pipers_cave/pipes.ly
+++ b/2-4_marches/pipers_cave/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/2-4_marches/point_of_war/pipes.ly b/2-4_marches/point_of_war/pipes.ly
index 5300bec..d37d995 100644
--- a/2-4_marches/point_of_war/pipes.ly
+++ b/2-4_marches/point_of_war/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/2-4_marches/teribus/pipes.ly b/2-4_marches/teribus/pipes.ly
index 5c085e0..ec629ab 100644
--- a/2-4_marches/teribus/pipes.ly
+++ b/2-4_marches/teribus/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/3-4_marches/ballad_of_the_green_berets/lyrics.ly b/3-4_marches/ballad_of_the_green_berets/lyrics.ly
index adc033c..2ed507d 100644
--- a/3-4_marches/ballad_of_the_green_berets/lyrics.ly
+++ b/3-4_marches/ballad_of_the_green_berets/lyrics.ly
@@ -1,5 +1,7 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 \include "notes.lyrics.ily"
diff --git a/3-4_marches/ballad_of_the_green_berets/pipes.ly b/3-4_marches/ballad_of_the_green_berets/pipes.ly
index efa0ca2..9b78289 100644
--- a/3-4_marches/ballad_of_the_green_berets/pipes.ly
+++ b/3-4_marches/ballad_of_the_green_berets/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/3-4_marches/balmoral/pipes.full.ly b/3-4_marches/balmoral/pipes.full.ly
index 97c5e59..2294d2f 100644
--- a/3-4_marches/balmoral/pipes.full.ly
+++ b/3-4_marches/balmoral/pipes.full.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 \include "notes.pipes.seconds.ily"
diff --git a/3-4_marches/balmoral/pipes.ly b/3-4_marches/balmoral/pipes.ly
index 06df072..d6a3cfd 100644
--- a/3-4_marches/balmoral/pipes.ly
+++ b/3-4_marches/balmoral/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/3-4_marches/balmoral/pipes.seconds.ly b/3-4_marches/balmoral/pipes.seconds.ly
index 666a969..077b250 100644
--- a/3-4_marches/balmoral/pipes.seconds.ly
+++ b/3-4_marches/balmoral/pipes.seconds.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.seconds.ily"
 
diff --git a/3-4_marches/balmoral/pipes.thirds.ly b/3-4_marches/balmoral/pipes.thirds.ly
index ee0f955..1602ac2 100644
--- a/3-4_marches/balmoral/pipes.thirds.ly
+++ b/3-4_marches/balmoral/pipes.thirds.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.thirds.ily"
 
diff --git a/3-4_marches/castle_dangerous/tenor.ly b/3-4_marches/castle_dangerous/tenor.ly
index 87e0cd6..cb9b694 100644
--- a/3-4_marches/castle_dangerous/tenor.ly
+++ b/3-4_marches/castle_dangerous/tenor.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.tenor.ily"
 
diff --git a/3-4_marches/collins_cattle/pipes.ly b/3-4_marches/collins_cattle/pipes.ly
index 42166b6..0997b07 100644
--- a/3-4_marches/collins_cattle/pipes.ly
+++ b/3-4_marches/collins_cattle/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/3-4_marches/jim_thomson_of_flagstaff/pipes.ly b/3-4_marches/jim_thomson_of_flagstaff/pipes.ly
index a0c6e25..c1a65bb 100644
--- a/3-4_marches/jim_thomson_of_flagstaff/pipes.ly
+++ b/3-4_marches/jim_thomson_of_flagstaff/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/3-4_marches/lochanside/pipes.ly b/3-4_marches/lochanside/pipes.ly
index 14a9bae..2d644e7 100644
--- a/3-4_marches/lochanside/pipes.ly
+++ b/3-4_marches/lochanside/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/3-4_marches/my_land/pipes.ly b/3-4_marches/my_land/pipes.ly
index 022623e..a3f43e6 100644
--- a/3-4_marches/my_land/pipes.ly
+++ b/3-4_marches/my_land/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/3-4_marches/on_the_road_to_passchendaele/full.ly b/3-4_marches/on_the_road_to_passchendaele/full.ly
index ead296e..07f6179 100644
--- a/3-4_marches/on_the_road_to_passchendaele/full.ly
+++ b/3-4_marches/on_the_road_to_passchendaele/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 %\include "notes.bass.ily"
 %\include "notes.tenor.ily"
diff --git a/3-4_marches/on_the_road_to_passchendaele/pipes.ly b/3-4_marches/on_the_road_to_passchendaele/pipes.ly
index 649ec1c..f3033a2 100644
--- a/3-4_marches/on_the_road_to_passchendaele/pipes.ly
+++ b/3-4_marches/on_the_road_to_passchendaele/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/3-4_marches/on_the_road_to_passchendaele/side.ly b/3-4_marches/on_the_road_to_passchendaele/side.ly
index 2d2bcd2..f9d9721 100644
--- a/3-4_marches/on_the_road_to_passchendaele/side.ly
+++ b/3-4_marches/on_the_road_to_passchendaele/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/3-4_marches/pipe_major_jk_cairns/pipes.ly b/3-4_marches/pipe_major_jk_cairns/pipes.ly
index 8c7835b..57b5de0 100644
--- a/3-4_marches/pipe_major_jk_cairns/pipes.ly
+++ b/3-4_marches/pipe_major_jk_cairns/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/3-4_marches/red_hackle/pipes.ly b/3-4_marches/red_hackle/pipes.ly
index 2703f1d..50b393f 100644
--- a/3-4_marches/red_hackle/pipes.ly
+++ b/3-4_marches/red_hackle/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/3-4_marches/shoals_of_herring/pipes.ly b/3-4_marches/shoals_of_herring/pipes.ly
index af9c50b..c6fb9c8 100644
--- a/3-4_marches/shoals_of_herring/pipes.ly
+++ b/3-4_marches/shoals_of_herring/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/3-4_marches/torosay_castle/pipes.ly b/3-4_marches/torosay_castle/pipes.ly
index 6be299c..b9af9dd 100644
--- a/3-4_marches/torosay_castle/pipes.ly
+++ b/3-4_marches/torosay_castle/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/4-4_marches/51st_highland_division/full.ly b/4-4_marches/51st_highland_division/full.ly
index 2988896..a747c95 100644
--- a/4-4_marches/51st_highland_division/full.ly
+++ b/4-4_marches/51st_highland_division/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 %\include "notes.bass.ily"
 %\include "notes.tenor.ily"
diff --git a/4-4_marches/51st_highland_division/pipes.ly b/4-4_marches/51st_highland_division/pipes.ly
index 2c859d9..4ee6faf 100644
--- a/4-4_marches/51st_highland_division/pipes.ly
+++ b/4-4_marches/51st_highland_division/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/4-4_marches/51st_highland_division/side.ly b/4-4_marches/51st_highland_division/side.ly
index 268f959..dd4a9ab 100644
--- a/4-4_marches/51st_highland_division/side.ly
+++ b/4-4_marches/51st_highland_division/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/4-4_marches/auld_lang_syne/pipes.ly b/4-4_marches/auld_lang_syne/pipes.ly
index 937720c..19b3e06 100644
--- a/4-4_marches/auld_lang_syne/pipes.ly
+++ b/4-4_marches/auld_lang_syne/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/4-4_marches/bonnie_galloway/pipes.ly b/4-4_marches/bonnie_galloway/pipes.ly
index 38ab7b9..e015f88 100644
--- a/4-4_marches/bonnie_galloway/pipes.ly
+++ b/4-4_marches/bonnie_galloway/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/4-4_marches/bonnie_lass_o_fyvie/pipes.ly b/4-4_marches/bonnie_lass_o_fyvie/pipes.ly
index 23edbeb..5a2ffe5 100644
--- a/4-4_marches/bonnie_lass_o_fyvie/pipes.ly
+++ b/4-4_marches/bonnie_lass_o_fyvie/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/4-4_marches/cabar_feidh/pipes.agira.ly b/4-4_marches/cabar_feidh/pipes.agira.ly
index ddfdad1..d344792 100644
--- a/4-4_marches/cabar_feidh/pipes.agira.ly
+++ b/4-4_marches/cabar_feidh/pipes.agira.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.agira.ily"
 
diff --git a/4-4_marches/cabar_feidh/pipes.charge.ly b/4-4_marches/cabar_feidh/pipes.charge.ly
index 00d19a1..6bd81e4 100644
--- a/4-4_marches/cabar_feidh/pipes.charge.ly
+++ b/4-4_marches/cabar_feidh/pipes.charge.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.charge.ily"
 
diff --git a/4-4_marches/cabar_feidh/pipes.ly b/4-4_marches/cabar_feidh/pipes.ly
index f919dfc..e782501 100644
--- a/4-4_marches/cabar_feidh/pipes.ly
+++ b/4-4_marches/cabar_feidh/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/4-4_marches/cockney_jocks/pipes.ly b/4-4_marches/cockney_jocks/pipes.ly
index a69c606..4bf7e83 100644
--- a/4-4_marches/cockney_jocks/pipes.ly
+++ b/4-4_marches/cockney_jocks/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/4-4_marches/dawning_of_the_day/pipes.full.ly b/4-4_marches/dawning_of_the_day/pipes.full.ly
index 2f62cfc..4916dae 100644
--- a/4-4_marches/dawning_of_the_day/pipes.full.ly
+++ b/4-4_marches/dawning_of_the_day/pipes.full.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 \include "notes.pipes.seconds.ily"
diff --git a/4-4_marches/dawning_of_the_day/pipes.ly b/4-4_marches/dawning_of_the_day/pipes.ly
index 8ab90bb..ac853aa 100644
--- a/4-4_marches/dawning_of_the_day/pipes.ly
+++ b/4-4_marches/dawning_of_the_day/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/4-4_marches/dawning_of_the_day/pipes.seconds.ly b/4-4_marches/dawning_of_the_day/pipes.seconds.ly
index 2ab6e3f..bb8522e 100644
--- a/4-4_marches/dawning_of_the_day/pipes.seconds.ly
+++ b/4-4_marches/dawning_of_the_day/pipes.seconds.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.seconds.ily"
 
diff --git a/4-4_marches/flett_from_flotta/full.ly b/4-4_marches/flett_from_flotta/full.ly
index c74e21f..b178c04 100644
--- a/4-4_marches/flett_from_flotta/full.ly
+++ b/4-4_marches/flett_from_flotta/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 %\include "notes.bass.ily"
 %\include "notes.tenor.ily"
diff --git a/4-4_marches/flett_from_flotta/pipes.ly b/4-4_marches/flett_from_flotta/pipes.ly
index 7432494..6deb600 100644
--- a/4-4_marches/flett_from_flotta/pipes.ly
+++ b/4-4_marches/flett_from_flotta/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/4-4_marches/flett_from_flotta/side.ly b/4-4_marches/flett_from_flotta/side.ly
index fff3bf2..10161bb 100644
--- a/4-4_marches/flett_from_flotta/side.ly
+++ b/4-4_marches/flett_from_flotta/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/4-4_marches/hills_of_argyll/pipes.ly b/4-4_marches/hills_of_argyll/pipes.ly
index 88ab64c..989485a 100644
--- a/4-4_marches/hills_of_argyll/pipes.ly
+++ b/4-4_marches/hills_of_argyll/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/4-4_marches/la_baum/pipes.full.ly b/4-4_marches/la_baum/pipes.full.ly
index c6d35af..d40ccc8 100644
--- a/4-4_marches/la_baum/pipes.full.ly
+++ b/4-4_marches/la_baum/pipes.full.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 \include "notes.pipes.seconds.ily"
diff --git a/4-4_marches/la_baum/pipes.ly b/4-4_marches/la_baum/pipes.ly
index 39cbec5..aefa6c4 100644
--- a/4-4_marches/la_baum/pipes.ly
+++ b/4-4_marches/la_baum/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/4-4_marches/la_baum/pipes.seconds.ly b/4-4_marches/la_baum/pipes.seconds.ly
index 3b6dfe2..7578459 100644
--- a/4-4_marches/la_baum/pipes.seconds.ly
+++ b/4-4_marches/la_baum/pipes.seconds.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.seconds.ily"
 
diff --git a/4-4_marches/maple_leaf_forever/pipes.ly b/4-4_marches/maple_leaf_forever/pipes.ly
index 5a209dc..81e1696 100644
--- a/4-4_marches/maple_leaf_forever/pipes.ly
+++ b/4-4_marches/maple_leaf_forever/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/4-4_marches/minstrel_boy/full.ly b/4-4_marches/minstrel_boy/full.ly
index 421a093..d4d964b 100644
--- a/4-4_marches/minstrel_boy/full.ly
+++ b/4-4_marches/minstrel_boy/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 %\include "notes.bass.ily"
 %\include "notes.tenor.ily"
diff --git a/4-4_marches/minstrel_boy/pipes.ly b/4-4_marches/minstrel_boy/pipes.ly
index 4e2189c..f65d90d 100644
--- a/4-4_marches/minstrel_boy/pipes.ly
+++ b/4-4_marches/minstrel_boy/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/4-4_marches/minstrel_boy/side.ly b/4-4_marches/minstrel_boy/side.ly
index c571071..702fab3 100644
--- a/4-4_marches/minstrel_boy/side.ly
+++ b/4-4_marches/minstrel_boy/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/4-4_marches/rowan_tree/full.ly b/4-4_marches/rowan_tree/full.ly
index c03c058..07651e9 100644
--- a/4-4_marches/rowan_tree/full.ly
+++ b/4-4_marches/rowan_tree/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 %\include "notes.bass.ily"
 %\include "notes.tenor.ily"
diff --git a/4-4_marches/rowan_tree/pipes.ly b/4-4_marches/rowan_tree/pipes.ly
index 5c3cd49..caffae0 100644
--- a/4-4_marches/rowan_tree/pipes.ly
+++ b/4-4_marches/rowan_tree/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/4-4_marches/rowan_tree/side.ly b/4-4_marches/rowan_tree/side.ly
index 2ad64c3..ec46f05 100644
--- a/4-4_marches/rowan_tree/side.ly
+++ b/4-4_marches/rowan_tree/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/4-4_marches/scotland_the_brave/full.ly b/4-4_marches/scotland_the_brave/full.ly
index daf7f2d..05b9fe1 100644
--- a/4-4_marches/scotland_the_brave/full.ly
+++ b/4-4_marches/scotland_the_brave/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 %\include "notes.bass.ily"
 %\include "notes.tenor.ily"
diff --git a/4-4_marches/scotland_the_brave/pipes.ly b/4-4_marches/scotland_the_brave/pipes.ly
index 6717753..11de5b2 100644
--- a/4-4_marches/scotland_the_brave/pipes.ly
+++ b/4-4_marches/scotland_the_brave/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/4-4_marches/scotland_the_brave/side.ly b/4-4_marches/scotland_the_brave/side.ly
index 66d692c..4a00fe6 100644
--- a/4-4_marches/scotland_the_brave/side.ly
+++ b/4-4_marches/scotland_the_brave/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/4-4_marches/the_crusaders_march/pipes.ly b/4-4_marches/the_crusaders_march/pipes.ly
index f04b60e..5b030e0 100644
--- a/4-4_marches/the_crusaders_march/pipes.ly
+++ b/4-4_marches/the_crusaders_march/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/4-4_marches/the_crusaders_march/side.ly b/4-4_marches/the_crusaders_march/side.ly
index 4327a81..2776680 100644
--- a/4-4_marches/the_crusaders_march/side.ly
+++ b/4-4_marches/the_crusaders_march/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/4-4_marches/the_leaving_of_liverpool/drums.ly b/4-4_marches/the_leaving_of_liverpool/drums.ly
index 6e27158..97a0fc0 100644
--- a/4-4_marches/the_leaving_of_liverpool/drums.ly
+++ b/4-4_marches/the_leaving_of_liverpool/drums.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 %\include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/4-4_marches/the_leaving_of_liverpool/full.ly b/4-4_marches/the_leaving_of_liverpool/full.ly
index e673b7e..8344b58 100644
--- a/4-4_marches/the_leaving_of_liverpool/full.ly
+++ b/4-4_marches/the_leaving_of_liverpool/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 %\include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/4-4_marches/the_leaving_of_liverpool/pipes.ly b/4-4_marches/the_leaving_of_liverpool/pipes.ly
index e86f4be..e5f3401 100644
--- a/4-4_marches/the_leaving_of_liverpool/pipes.ly
+++ b/4-4_marches/the_leaving_of_liverpool/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 \score {
diff --git a/4-4_marches/the_leaving_of_liverpool/side.ly b/4-4_marches/the_leaving_of_liverpool/side.ly
index b9c7f73..da1f6b5 100644
--- a/4-4_marches/the_leaving_of_liverpool/side.ly
+++ b/4-4_marches/the_leaving_of_liverpool/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/4-4_marches/the_leaving_of_liverpool/tenor.ly b/4-4_marches/the_leaving_of_liverpool/tenor.ly
index df92d86..aa584f4 100644
--- a/4-4_marches/the_leaving_of_liverpool/tenor.ly
+++ b/4-4_marches/the_leaving_of_liverpool/tenor.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.tenor.ily"
 
diff --git a/4-4_marches/the_old_rustic_bridge/full.ly b/4-4_marches/the_old_rustic_bridge/full.ly
index 01a17ee..d758176 100644
--- a/4-4_marches/the_old_rustic_bridge/full.ly
+++ b/4-4_marches/the_old_rustic_bridge/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 %\include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/4-4_marches/the_old_rustic_bridge/pipes.ly b/4-4_marches/the_old_rustic_bridge/pipes.ly
index f4d9888..22112b2 100644
--- a/4-4_marches/the_old_rustic_bridge/pipes.ly
+++ b/4-4_marches/the_old_rustic_bridge/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/4-4_marches/the_old_rustic_bridge/tenor.ly b/4-4_marches/the_old_rustic_bridge/tenor.ly
index bfda252..ec3d099 100644
--- a/4-4_marches/the_old_rustic_bridge/tenor.ly
+++ b/4-4_marches/the_old_rustic_bridge/tenor.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.tenor.ily"
 
diff --git a/4-4_marches/the_pikemans_march/bass.ly b/4-4_marches/the_pikemans_march/bass.ly
index 21e33a1..32f6218 100644
--- a/4-4_marches/the_pikemans_march/bass.ly
+++ b/4-4_marches/the_pikemans_march/bass.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 
diff --git a/4-4_marches/the_pikemans_march/drums.ly b/4-4_marches/the_pikemans_march/drums.ly
index 615a09f..53544cd 100644
--- a/4-4_marches/the_pikemans_march/drums.ly
+++ b/4-4_marches/the_pikemans_march/drums.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/4-4_marches/the_pikemans_march/pipes.ly b/4-4_marches/the_pikemans_march/pipes.ly
index bdbb39a..326dfee 100644
--- a/4-4_marches/the_pikemans_march/pipes.ly
+++ b/4-4_marches/the_pikemans_march/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/4-4_marches/the_pikemans_march/side.ly b/4-4_marches/the_pikemans_march/side.ly
index 6f95f6d..973b88f 100644
--- a/4-4_marches/the_pikemans_march/side.ly
+++ b/4-4_marches/the_pikemans_march/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/4-4_marches/the_pikemans_march/tenor.ly b/4-4_marches/the_pikemans_march/tenor.ly
index e7ee66c..1de37c0 100644
--- a/4-4_marches/the_pikemans_march/tenor.ly
+++ b/4-4_marches/the_pikemans_march/tenor.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.tenor.ily"
 
diff --git a/4-4_marches/were_no_awa_tae_bide_awa/full.ly b/4-4_marches/were_no_awa_tae_bide_awa/full.ly
index 6594ba1..2540939 100644
--- a/4-4_marches/were_no_awa_tae_bide_awa/full.ly
+++ b/4-4_marches/were_no_awa_tae_bide_awa/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 %\include "notes.bass.ily"
 %\include "notes.tenor.ily"
diff --git a/4-4_marches/were_no_awa_tae_bide_awa/pipes.ly b/4-4_marches/were_no_awa_tae_bide_awa/pipes.ly
index 3edd7c5..b136eab 100644
--- a/4-4_marches/were_no_awa_tae_bide_awa/pipes.ly
+++ b/4-4_marches/were_no_awa_tae_bide_awa/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/4-4_marches/were_no_awa_tae_bide_awa/side.ly b/4-4_marches/were_no_awa_tae_bide_awa/side.ly
index a1c3521..ad7c590 100644
--- a/4-4_marches/were_no_awa_tae_bide_awa/side.ly
+++ b/4-4_marches/were_no_awa_tae_bide_awa/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/4-4_marches/when_the_pipers_play/pipes.ly b/4-4_marches/when_the_pipers_play/pipes.ly
index 28a9ce9..e9cc20f 100644
--- a/4-4_marches/when_the_pipers_play/pipes.ly
+++ b/4-4_marches/when_the_pipers_play/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/4-4_marches/wings/full.ly b/4-4_marches/wings/full.ly
index 8b20ede..209711f 100644
--- a/4-4_marches/wings/full.ly
+++ b/4-4_marches/wings/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 %\include "notes.bass.ily"
 %\include "notes.tenor.ily"
diff --git a/4-4_marches/wings/pipes.ly b/4-4_marches/wings/pipes.ly
index 4c96b12..4b8648a 100644
--- a/4-4_marches/wings/pipes.ly
+++ b/4-4_marches/wings/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/4-4_marches/wings/side.ly b/4-4_marches/wings/side.ly
index 6993799..28f5135 100644
--- a/4-4_marches/wings/side.ly
+++ b/4-4_marches/wings/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/5-4_marches/cullen_bay/bass.ly b/5-4_marches/cullen_bay/bass.ly
index 661ebe9..9e3eb97 100644
--- a/5-4_marches/cullen_bay/bass.ly
+++ b/5-4_marches/cullen_bay/bass.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 
diff --git a/5-4_marches/cullen_bay/drums.ly b/5-4_marches/cullen_bay/drums.ly
index 8b91693..e278cc3 100644
--- a/5-4_marches/cullen_bay/drums.ly
+++ b/5-4_marches/cullen_bay/drums.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/5-4_marches/cullen_bay/full.ly b/5-4_marches/cullen_bay/full.ly
index 6a64c92..02786d0 100644
--- a/5-4_marches/cullen_bay/full.ly
+++ b/5-4_marches/cullen_bay/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/5-4_marches/cullen_bay/pipes.ly b/5-4_marches/cullen_bay/pipes.ly
index 799ed90..b82f7f9 100644
--- a/5-4_marches/cullen_bay/pipes.ly
+++ b/5-4_marches/cullen_bay/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/5-4_marches/cullen_bay/side.ly b/5-4_marches/cullen_bay/side.ly
index 01a24ce..362bea3 100644
--- a/5-4_marches/cullen_bay/side.ly
+++ b/5-4_marches/cullen_bay/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/5-4_marches/cullen_bay/tenor.ly b/5-4_marches/cullen_bay/tenor.ly
index 260b58e..7cd4522 100644
--- a/5-4_marches/cullen_bay/tenor.ly
+++ b/5-4_marches/cullen_bay/tenor.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.tenor.ily"
 
diff --git a/6-8_marches/72nd_highlanders/pipes.ly b/6-8_marches/72nd_highlanders/pipes.ly
index 662d8f2..e61d4b7 100644
--- a/6-8_marches/72nd_highlanders/pipes.ly
+++ b/6-8_marches/72nd_highlanders/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/6-8_marches/cock_o_the_north/pipes.ly b/6-8_marches/cock_o_the_north/pipes.ly
index 7979dec..e4f09f0 100644
--- a/6-8_marches/cock_o_the_north/pipes.ly
+++ b/6-8_marches/cock_o_the_north/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/6-8_marches/farewell_to_the_creeks/pipes.ly b/6-8_marches/farewell_to_the_creeks/pipes.ly
index 6901ab2..36ce397 100644
--- a/6-8_marches/farewell_to_the_creeks/pipes.ly
+++ b/6-8_marches/farewell_to_the_creeks/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/6-8_marches/glendaruel_highlanders/pipes.ly b/6-8_marches/glendaruel_highlanders/pipes.ly
index 1ed0751..e9bd209 100644
--- a/6-8_marches/glendaruel_highlanders/pipes.ly
+++ b/6-8_marches/glendaruel_highlanders/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/6-8_marches/hills_of_glenorchy/side.ly b/6-8_marches/hills_of_glenorchy/side.ly
index 7b6381b..20b870b 100644
--- a/6-8_marches/hills_of_glenorchy/side.ly
+++ b/6-8_marches/hills_of_glenorchy/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/6-8_marches/kilaloe/pipes.ly b/6-8_marches/kilaloe/pipes.ly
index 5159894..da031d1 100644
--- a/6-8_marches/kilaloe/pipes.ly
+++ b/6-8_marches/kilaloe/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/6-8_marches/piobaireachd_of_donald_dubh/pipes.ly b/6-8_marches/piobaireachd_of_donald_dubh/pipes.ly
index 7b999e5..14b49cc 100644
--- a/6-8_marches/piobaireachd_of_donald_dubh/pipes.ly
+++ b/6-8_marches/piobaireachd_of_donald_dubh/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/6-8_marches/the_steamboat/pipes.ly b/6-8_marches/the_steamboat/pipes.ly
index 7111f1b..58b5763 100644
--- a/6-8_marches/the_steamboat/pipes.ly
+++ b/6-8_marches/the_steamboat/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/9-8_marches/battle_of_the_somme/pipes.ly b/9-8_marches/battle_of_the_somme/pipes.ly
index 8948744..36ee333 100644
--- a/9-8_marches/battle_of_the_somme/pipes.ly
+++ b/9-8_marches/battle_of_the_somme/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/9-8_marches/going_to_vancouver_hills/pipes.ly b/9-8_marches/going_to_vancouver_hills/pipes.ly
index 4ee3301..eea11d8 100644
--- a/9-8_marches/going_to_vancouver_hills/pipes.ly
+++ b/9-8_marches/going_to_vancouver_hills/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/9-8_marches/heights_of_dargai/pipes.ly b/9-8_marches/heights_of_dargai/pipes.ly
index 6dd8187..e713e0a 100644
--- a/9-8_marches/heights_of_dargai/pipes.ly
+++ b/9-8_marches/heights_of_dargai/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/airs/abide_with_me/full.ly b/airs/abide_with_me/full.ly
index ac36cf6..a1b72bb 100644
--- a/airs/abide_with_me/full.ly
+++ b/airs/abide_with_me/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 %\include "notes.bass.ily"
 %\include "notes.tenor.ily"
diff --git a/airs/abide_with_me/lyrics.pipes.ly b/airs/abide_with_me/lyrics.pipes.ly
index 2da16c3..62c739c 100644
--- a/airs/abide_with_me/lyrics.pipes.ly
+++ b/airs/abide_with_me/lyrics.pipes.ly
@@ -1,5 +1,7 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 \include "notes.lyrics.ily"
diff --git a/airs/abide_with_me/pipes.ly b/airs/abide_with_me/pipes.ly
index 79bfeaf..3afda55 100644
--- a/airs/abide_with_me/pipes.ly
+++ b/airs/abide_with_me/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/airs/abide_with_me/side.ly b/airs/abide_with_me/side.ly
index dc92426..203a307 100644
--- a/airs/abide_with_me/side.ly
+++ b/airs/abide_with_me/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/airs/alexander_mackenzie/bass.ly b/airs/alexander_mackenzie/bass.ly
index 5fbae50..9f5e06e 100644
--- a/airs/alexander_mackenzie/bass.ly
+++ b/airs/alexander_mackenzie/bass.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 
diff --git a/airs/alexander_mackenzie/drums.ly b/airs/alexander_mackenzie/drums.ly
index 1101af7..6b1aa5e 100644
--- a/airs/alexander_mackenzie/drums.ly
+++ b/airs/alexander_mackenzie/drums.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/airs/alexander_mackenzie/full.ly b/airs/alexander_mackenzie/full.ly
index 349fa03..4790853 100644
--- a/airs/alexander_mackenzie/full.ly
+++ b/airs/alexander_mackenzie/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/airs/alexander_mackenzie/pipes.full.ly b/airs/alexander_mackenzie/pipes.full.ly
index 641fbb8..d2bd8c5 100644
--- a/airs/alexander_mackenzie/pipes.full.ly
+++ b/airs/alexander_mackenzie/pipes.full.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 \include "notes.pipes.seconds.ily"
diff --git a/airs/alexander_mackenzie/pipes.ly b/airs/alexander_mackenzie/pipes.ly
index cd9176c..784694d 100644
--- a/airs/alexander_mackenzie/pipes.ly
+++ b/airs/alexander_mackenzie/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/airs/alexander_mackenzie/pipes.seconds.ly b/airs/alexander_mackenzie/pipes.seconds.ly
index fd153b4..9adfba3 100644
--- a/airs/alexander_mackenzie/pipes.seconds.ly
+++ b/airs/alexander_mackenzie/pipes.seconds.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.seconds.ily"
 
diff --git a/airs/alexander_mackenzie/side.ly b/airs/alexander_mackenzie/side.ly
index 1d73869..56a648b 100644
--- a/airs/alexander_mackenzie/side.ly
+++ b/airs/alexander_mackenzie/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/airs/alexander_mackenzie/tenor.ly b/airs/alexander_mackenzie/tenor.ly
index b455d17..f4944bc 100644
--- a/airs/alexander_mackenzie/tenor.ly
+++ b/airs/alexander_mackenzie/tenor.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.tenor.ily"
 
diff --git a/airs/amazing_grace/full.ly b/airs/amazing_grace/full.ly
index 6138467..43c2cbf 100644
--- a/airs/amazing_grace/full.ly
+++ b/airs/amazing_grace/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 %\include "notes.bass.ily"
 %\include "notes.tenor.ily"
diff --git a/airs/amazing_grace/pipes.ly b/airs/amazing_grace/pipes.ly
index f48f793..f9b7950 100644
--- a/airs/amazing_grace/pipes.ly
+++ b/airs/amazing_grace/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/airs/amazing_grace/side.ly b/airs/amazing_grace/side.ly
index 0600314..83181d3 100644
--- a/airs/amazing_grace/side.ly
+++ b/airs/amazing_grace/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/airs/bells_of_dunblane/pipes.full.ly b/airs/bells_of_dunblane/pipes.full.ly
index f415e8c..2207f78 100644
--- a/airs/bells_of_dunblane/pipes.full.ly
+++ b/airs/bells_of_dunblane/pipes.full.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 \include "notes.pipes.seconds.ily"
diff --git a/airs/bells_of_dunblane/pipes.ly b/airs/bells_of_dunblane/pipes.ly
index 323369f..887e8e4 100644
--- a/airs/bells_of_dunblane/pipes.ly
+++ b/airs/bells_of_dunblane/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/airs/bells_of_dunblane/pipes.seconds.ly b/airs/bells_of_dunblane/pipes.seconds.ly
index 5cc70b1..e5fe58f 100644
--- a/airs/bells_of_dunblane/pipes.seconds.ly
+++ b/airs/bells_of_dunblane/pipes.seconds.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.seconds.ily"
 
diff --git a/airs/dark_island/pipes.ly b/airs/dark_island/pipes.ly
index 22316d0..7427239 100644
--- a/airs/dark_island/pipes.ly
+++ b/airs/dark_island/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/airs/farewell_to_camraw/drums.ly b/airs/farewell_to_camraw/drums.ly
index 56172bd..5d1bed6 100644
--- a/airs/farewell_to_camraw/drums.ly
+++ b/airs/farewell_to_camraw/drums.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 %\include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/airs/farewell_to_camraw/side.ly b/airs/farewell_to_camraw/side.ly
index 88a31ab..0819a5a 100644
--- a/airs/farewell_to_camraw/side.ly
+++ b/airs/farewell_to_camraw/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/airs/farewell_to_camraw/tenor.ly b/airs/farewell_to_camraw/tenor.ly
index ce31ef0..16cbc8d 100644
--- a/airs/farewell_to_camraw/tenor.ly
+++ b/airs/farewell_to_camraw/tenor.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.tenor.ily"
 
diff --git a/airs/flower_of_scotland/full.ly b/airs/flower_of_scotland/full.ly
index 341b11d..81f9da2 100644
--- a/airs/flower_of_scotland/full.ly
+++ b/airs/flower_of_scotland/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 %\include "notes.bass.ily"
 %\include "notes.tenor.ily"
diff --git a/airs/flower_of_scotland/lyrics.ly b/airs/flower_of_scotland/lyrics.ly
index 795470e..e40ed04 100644
--- a/airs/flower_of_scotland/lyrics.ly
+++ b/airs/flower_of_scotland/lyrics.ly
@@ -1,5 +1,7 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 \include "notes.lyrics.ily"
diff --git a/airs/flower_of_scotland/pipes.ly b/airs/flower_of_scotland/pipes.ly
index e54df8c..2755b57 100644
--- a/airs/flower_of_scotland/pipes.ly
+++ b/airs/flower_of_scotland/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/airs/flower_of_scotland/side.ly b/airs/flower_of_scotland/side.ly
index 05b1c0f..482c93e 100644
--- a/airs/flower_of_scotland/side.ly
+++ b/airs/flower_of_scotland/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/airs/highland_cathedral/pipes.ly b/airs/highland_cathedral/pipes.ly
index 2a08c8f..2e75247 100644
--- a/airs/highland_cathedral/pipes.ly
+++ b/airs/highland_cathedral/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/airs/loch_duich/full.ly b/airs/loch_duich/full.ly
index 3d56036..9a23f1a 100644
--- a/airs/loch_duich/full.ly
+++ b/airs/loch_duich/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 %\include "notes.bass.ily"
 %\include "notes.tenor.ily"
diff --git a/airs/loch_duich/pipes.full.ly b/airs/loch_duich/pipes.full.ly
index 7a26637..df1e87c 100644
--- a/airs/loch_duich/pipes.full.ly
+++ b/airs/loch_duich/pipes.full.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 \include "notes.pipes.seconds.ily"
diff --git a/airs/loch_duich/pipes.ly b/airs/loch_duich/pipes.ly
index 657846b..66b5c06 100644
--- a/airs/loch_duich/pipes.ly
+++ b/airs/loch_duich/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/airs/loch_duich/pipes.seconds.ly b/airs/loch_duich/pipes.seconds.ly
index acaf4db..c2d99c5 100644
--- a/airs/loch_duich/pipes.seconds.ly
+++ b/airs/loch_duich/pipes.seconds.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.seconds.ily"
 
diff --git a/airs/loch_duich/side.ly b/airs/loch_duich/side.ly
index 63d51b1..3e9c280 100644
--- a/airs/loch_duich/side.ly
+++ b/airs/loch_duich/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/airs/miss_kirkwood/full.ly b/airs/miss_kirkwood/full.ly
index 1e8d958..38c70cc 100644
--- a/airs/miss_kirkwood/full.ly
+++ b/airs/miss_kirkwood/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 %\include "notes.bass.ily"
 %\include "notes.tenor.ily"
diff --git a/airs/miss_kirkwood/pipes.full.ly b/airs/miss_kirkwood/pipes.full.ly
index 3e96e3b..35f64c8 100644
--- a/airs/miss_kirkwood/pipes.full.ly
+++ b/airs/miss_kirkwood/pipes.full.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 \include "notes.pipes.seconds.ily"
diff --git a/airs/miss_kirkwood/pipes.ly b/airs/miss_kirkwood/pipes.ly
index 53afdbf..b345a1e 100644
--- a/airs/miss_kirkwood/pipes.ly
+++ b/airs/miss_kirkwood/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/airs/miss_kirkwood/pipes.seconds.ly b/airs/miss_kirkwood/pipes.seconds.ly
index 4c48950..bf04ce5 100644
--- a/airs/miss_kirkwood/pipes.seconds.ly
+++ b/airs/miss_kirkwood/pipes.seconds.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.seconds.ily"
 
diff --git a/airs/miss_kirkwood/side.ly b/airs/miss_kirkwood/side.ly
index 12e7762..74880b7 100644
--- a/airs/miss_kirkwood/side.ly
+++ b/airs/miss_kirkwood/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/airs/morag_of_dunvegan/bass.ly b/airs/morag_of_dunvegan/bass.ly
index 6e90d5b..37d21f5 100644
--- a/airs/morag_of_dunvegan/bass.ly
+++ b/airs/morag_of_dunvegan/bass.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 
diff --git a/airs/morag_of_dunvegan/drums.ly b/airs/morag_of_dunvegan/drums.ly
index b3daf08..266eea9 100644
--- a/airs/morag_of_dunvegan/drums.ly
+++ b/airs/morag_of_dunvegan/drums.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/airs/morag_of_dunvegan/full.ly b/airs/morag_of_dunvegan/full.ly
index 322ba6f..3e9131e 100644
--- a/airs/morag_of_dunvegan/full.ly
+++ b/airs/morag_of_dunvegan/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/airs/morag_of_dunvegan/pipes.ly b/airs/morag_of_dunvegan/pipes.ly
index e373faa..670ab5d 100644
--- a/airs/morag_of_dunvegan/pipes.ly
+++ b/airs/morag_of_dunvegan/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/airs/morag_of_dunvegan/side.ly b/airs/morag_of_dunvegan/side.ly
index 28abf9c..ac12159 100644
--- a/airs/morag_of_dunvegan/side.ly
+++ b/airs/morag_of_dunvegan/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/airs/morag_of_dunvegan/tenor.ly b/airs/morag_of_dunvegan/tenor.ly
index b860ce5..d12d7d9 100644
--- a/airs/morag_of_dunvegan/tenor.ly
+++ b/airs/morag_of_dunvegan/tenor.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.tenor.ily"
 
diff --git a/airs/mull_of_kintyre/lyrics.pipes.ly b/airs/mull_of_kintyre/lyrics.pipes.ly
index 9e583d1..b88cb32 100644
--- a/airs/mull_of_kintyre/lyrics.pipes.ly
+++ b/airs/mull_of_kintyre/lyrics.pipes.ly
@@ -1,5 +1,7 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 \include "notes.lyrics.ily"
diff --git a/airs/mull_of_kintyre/pipes.ly b/airs/mull_of_kintyre/pipes.ly
index 74f77cb..120cef8 100644
--- a/airs/mull_of_kintyre/pipes.ly
+++ b/airs/mull_of_kintyre/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/airs/my_home/drums.ly b/airs/my_home/drums.ly
index 3eb253f..54fc69a 100644
--- a/airs/my_home/drums.ly
+++ b/airs/my_home/drums.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/airs/my_home/full.ly b/airs/my_home/full.ly
index 5b28ded..52f251e 100644
--- a/airs/my_home/full.ly
+++ b/airs/my_home/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/airs/my_home/pipes.ly b/airs/my_home/pipes.ly
index b1f6847..d3e5244 100644
--- a/airs/my_home/pipes.ly
+++ b/airs/my_home/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/airs/my_home/side.ly b/airs/my_home/side.ly
index b97df0f..822c479 100644
--- a/airs/my_home/side.ly
+++ b/airs/my_home/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/airs/my_home/tenor.ly b/airs/my_home/tenor.ly
index da4d91d..cd0fb86 100644
--- a/airs/my_home/tenor.ly
+++ b/airs/my_home/tenor.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.tenor.ily"
 
diff --git a/airs/the_mist_covered_mountains/drums.ly b/airs/the_mist_covered_mountains/drums.ly
index 6532124..745403a 100644
--- a/airs/the_mist_covered_mountains/drums.ly
+++ b/airs/the_mist_covered_mountains/drums.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 %\include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/airs/the_mist_covered_mountains/full.ly b/airs/the_mist_covered_mountains/full.ly
index dddea9c..8637ad5 100644
--- a/airs/the_mist_covered_mountains/full.ly
+++ b/airs/the_mist_covered_mountains/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 %\include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/airs/the_mist_covered_mountains/pipes.ly b/airs/the_mist_covered_mountains/pipes.ly
index ae15e0b..d6c5aef 100644
--- a/airs/the_mist_covered_mountains/pipes.ly
+++ b/airs/the_mist_covered_mountains/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/airs/the_mist_covered_mountains/side.ly b/airs/the_mist_covered_mountains/side.ly
index 5673e87..f46beaf 100644
--- a/airs/the_mist_covered_mountains/side.ly
+++ b/airs/the_mist_covered_mountains/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/airs/the_mist_covered_mountains/tenor.ly b/airs/the_mist_covered_mountains/tenor.ly
index a1646cc..5f008b8 100644
--- a/airs/the_mist_covered_mountains/tenor.ly
+++ b/airs/the_mist_covered_mountains/tenor.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.tenor.ily"
 
diff --git a/fix.sh b/fix.sh
new file mode 100644
index 0000000..8c85d90
--- /dev/null
+++ b/fix.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+BAGPIPE="\\\\include \"bagpipe.ly\""
+LILYDRUM="\\\\include \"lilydrum.ly\""
+CONFIG="\\\\include \"config.ily\""
+
+sed "s/${CONFIG}/${BAGPIPE}\n${LILYDRUM}\n\n${CONFIG}/g" -i **/**/full.ly **/full.ly
+sed "s/${CONFIG}/${BAGPIPE}\n\n${CONFIG}/g" -i **/**/pipes*.ly **/pipes*.ly
+sed "s/${CONFIG}/${LILYDRUM}\n\n${CONFIG}/g" -i **/**/drums*.ly **/drums*.ly
+sed "s/${CONFIG}/${LILYDRUM}\n\n${CONFIG}/g" -i **/**/bass*.ly **/bass*.ly
+sed "s/${CONFIG}/${LILYDRUM}\n\n${CONFIG}/g" -i **/**/tenor*.ly **/tenor*.ly
+sed "s/${CONFIG}/${LILYDRUM}\n\n${CONFIG}/g" -i **/**/side*.ly **/side*.ly
diff --git a/hornpipes/cabar_feidh/pipes.ly b/hornpipes/cabar_feidh/pipes.ly
index 3940f6d..436585d 100644
--- a/hornpipes/cabar_feidh/pipes.ly
+++ b/hornpipes/cabar_feidh/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/hornpipes/itchy_fingers/side.ly b/hornpipes/itchy_fingers/side.ly
index e71eb1f..52755f4 100644
--- a/hornpipes/itchy_fingers/side.ly
+++ b/hornpipes/itchy_fingers/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/hornpipes/the_jolly_beggarman/pipes.ly b/hornpipes/the_jolly_beggarman/pipes.ly
index 9b8a783..cab353a 100644
--- a/hornpipes/the_jolly_beggarman/pipes.ly
+++ b/hornpipes/the_jolly_beggarman/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/hornpipes/the_walrus/bass.ly b/hornpipes/the_walrus/bass.ly
index 3dd44dd..a34dbc2 100644
--- a/hornpipes/the_walrus/bass.ly
+++ b/hornpipes/the_walrus/bass.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 
diff --git a/hornpipes/the_walrus/drums.ly b/hornpipes/the_walrus/drums.ly
index 34698d6..0a0181d 100644
--- a/hornpipes/the_walrus/drums.ly
+++ b/hornpipes/the_walrus/drums.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/hornpipes/the_walrus/full.ly b/hornpipes/the_walrus/full.ly
index 36cdd0d..929330c 100644
--- a/hornpipes/the_walrus/full.ly
+++ b/hornpipes/the_walrus/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 %\include "notes.tenor.ily"
diff --git a/hornpipes/the_walrus/pipes.ly b/hornpipes/the_walrus/pipes.ly
index 8cba39c..63f583b 100644
--- a/hornpipes/the_walrus/pipes.ly
+++ b/hornpipes/the_walrus/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/hornpipes/the_walrus/side.ly b/hornpipes/the_walrus/side.ly
index 3c66f04..9f611bf 100644
--- a/hornpipes/the_walrus/side.ly
+++ b/hornpipes/the_walrus/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/hornpipes/the_walrus/tenor.ly b/hornpipes/the_walrus/tenor.ly
index 3427bf0..7533eff 100644
--- a/hornpipes/the_walrus/tenor.ly
+++ b/hornpipes/the_walrus/tenor.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.tenor.ily"
 
diff --git a/jigs/cabar_feidh/pipes.ly b/jigs/cabar_feidh/pipes.ly
index 1c1417a..b8cc6df 100644
--- a/jigs/cabar_feidh/pipes.ly
+++ b/jigs/cabar_feidh/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/jigs/seaforth_sticks/bass.ly b/jigs/seaforth_sticks/bass.ly
index 5296404..3cc98e5 100644
--- a/jigs/seaforth_sticks/bass.ly
+++ b/jigs/seaforth_sticks/bass.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 
diff --git a/jigs/seaforth_sticks/drums.ly b/jigs/seaforth_sticks/drums.ly
index 607d81c..366e4f5 100644
--- a/jigs/seaforth_sticks/drums.ly
+++ b/jigs/seaforth_sticks/drums.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/jigs/seaforth_sticks/side.ly b/jigs/seaforth_sticks/side.ly
index 20d9192..5a396e5 100644
--- a/jigs/seaforth_sticks/side.ly
+++ b/jigs/seaforth_sticks/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/jigs/seaforth_sticks/tenor.ly b/jigs/seaforth_sticks/tenor.ly
index 58829d4..c1e3052 100644
--- a/jigs/seaforth_sticks/tenor.ly
+++ b/jigs/seaforth_sticks/tenor.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.tenor.ily"
 
diff --git a/other/god_save_the_queen/pipes.ly b/other/god_save_the_queen/pipes.ly
index 157b884..e6bfcad 100644
--- a/other/god_save_the_queen/pipes.ly
+++ b/other/god_save_the_queen/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/other/jonge_prins_van_friesland/bass.ly b/other/jonge_prins_van_friesland/bass.ly
new file mode 100644
index 0000000..eb32ab5
--- /dev/null
+++ b/other/jonge_prins_van_friesland/bass.ly
@@ -0,0 +1,38 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
+\include "config.ily"
+\include "notes.bass.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+        \global
+		\bassglobal
+		<<
+			\new NullVoice = "format"
+			{
+				
+			}%Format
+			\new DrumVoice { 
+				
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentBass
+		composer = \composerBass
+	}
+}
diff --git a/other/jonge_prins_van_friesland/drums.ly b/other/jonge_prins_van_friesland/drums.ly
new file mode 100644
index 0000000..5e7a353
--- /dev/null
+++ b/other/jonge_prins_van_friesland/drums.ly
@@ -0,0 +1,80 @@
+\version "2.19.0"
+
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
+\include "config.ily"
+\include "notes.bass.ily"
+\include "notes.tenor.ily"
+\include "notes.side.ily"
+
+\score {
+	\new StaffGroup <<
+		\new PipeBandDrumStaff = "side" {
+			\global
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+
+			<<
+				\new NullVoice = "format" {
+					\part
+					\line
+					\bar "|."
+				}%End of Format
+				\new DrumVoice = "side" {
+					\snareA s4
+				}%End of side
+			>>
+		}
+		\new PipeBandDrumStaff = "trom" {
+			\global
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{Trom}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{T.}
+
+			\new DrumVoice = "side" {
+				\snareOrigA s4
+			}%End of side
+		}
+		\new PipeBandDrumStaff = "tenor" {
+			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+
+			\tenorA s4
+		}
+		\new PipeBandDrumStaff = "bass" {
+			\bassglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+
+				\bassA s4
+		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup {
+			\column \right-align {
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}
diff --git a/other/jonge_prins_van_friesland/full.ly b/other/jonge_prins_van_friesland/full.ly
new file mode 100644
index 0000000..7b56a79
--- /dev/null
+++ b/other/jonge_prins_van_friesland/full.ly
@@ -0,0 +1,106 @@
+\version "2.19.0"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "config.ily"
+\include "notes.bass.ily"
+\include "notes.tenor.ily"
+\include "notes.side.ily"
+\include "notes.pipes.ily"
+%\include "notes.pipes.seconds.ily"
+%\include "notes.lyrics.ily"
+
+\score {
+	\new StaffGroup <<
+		\new Staff {
+			\global
+			\pipeglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
+			<<
+				\new NullVoice = "format" {
+					
+				}%Format
+
+				\new Voice = "pipes" {
+					
+				}%Pipes
+			>>
+		}
+%		\new Staff = "song" {
+%  			\lyricsglobal
+%			\new Voice = "lyrics" {
+%				
+%			}
+%		}
+%		\new Lyrics = "verse1" {
+%		  \lyricsglobal
+%		  \lyricsto "lyrics" {
+%			\verseA
+%		  }
+%		}
+%		\new Staff = "seconds" {
+%			\pipessecndglobal
+%			\set Staff.instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
+%			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentTrd}
+%
+%
+%		}
+		\new PipeBandDrumStaff = "side" {
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+
+		}
+		\new PipeBandDrumStaff = "tenor" {
+			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+
+		}
+		\new PipeBandDrumStaff = "bass" {
+			\bassglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+
+		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup \large {
+			\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} )
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \composerPipessecnd ":" }} #} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { "Lyrics" } } #} )
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \instrumentPipessecnd }}#} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}
diff --git a/other/jonge_prins_van_friesland/pipes.ly b/other/jonge_prins_van_friesland/pipes.ly
new file mode 100644
index 0000000..5371471
--- /dev/null
+++ b/other/jonge_prins_van_friesland/pipes.ly
@@ -0,0 +1,51 @@
+\version "2.18.2"
+
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			\new NullVoice = "format" {
+			
+			}%Format
+			
+			\new Voice = "pipes" {
+			
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/other/jonge_prins_van_friesland/side.ly b/other/jonge_prins_van_friesland/side.ly
new file mode 100644
index 0000000..b109f7c
--- /dev/null
+++ b/other/jonge_prins_van_friesland/side.ly
@@ -0,0 +1,38 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
+\include "config.ily"
+\include "notes.side.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+        \global
+		\sideglobal
+		<<
+			\new NullVoice = "format" {
+			
+			}%Format
+			
+			\new DrumVoice = "side" {
+			
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentSide
+		composer = \composerSide
+	}
+}
diff --git a/other/jonge_prins_van_friesland/tenor.ly b/other/jonge_prins_van_friesland/tenor.ly
new file mode 100644
index 0000000..e34d20f
--- /dev/null
+++ b/other/jonge_prins_van_friesland/tenor.ly
@@ -0,0 +1,47 @@
+\version "2.18.2"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
+\include "config.ily"
+\include "notes.tenor.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+	\global
+	\tenorglobal
+	<<
+			\new NullVoice = "format" {
+			
+			}%Format
+			
+			\new DrumVoice = "tenor" {
+			
+			}
+	>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentTenor
+		composer = \composerTenor
+	}
+}
diff --git a/other/la_marseillaise/lyrics.ly b/other/la_marseillaise/lyrics.ly
new file mode 100644
index 0000000..17cb8cb
--- /dev/null
+++ b/other/la_marseillaise/lyrics.ly
@@ -0,0 +1,52 @@
+\version "2.18.2"
+
+\include "config.ily"
+%\include "notes.pipes.ily"
+\include "notes.lyrics.ily"
+
+\score {
+    \new Staff {
+		\global
+		\lyricsglobal
+		<<
+%		  	\new NullVoice = "format"{
+%				
+%			}%Format
+
+			\new Voice = "tune" {
+				
+			}
+
+			\new Lyrics = "lyrics" {
+				\lyricsto "tune" { 
+					
+				}
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentLyrics
+		composer = \markup \large {
+		  	\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics } } #} )
+				$(if (not (string=? "" composerPipes)) #{ \markup { \line { \composerPipes  ":" } } #} )
+		  	}
+			\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { } } #} )
+			    $(if (not (string=? "" composerPipes)) #{ \markup { \line { \instrumentPipes  } } #} )
+			}
+		}
+
+	}
+}
+%\markup {
+%  \fill-line{
+%	\column {
+%	  \verseAblock
+%	  \combine \null \vspace #0.5
+%	  \verseBblock
+%	}
+%  }
+%}
diff --git a/other/la_marseillaise/pipes.ly b/other/la_marseillaise/pipes.ly
index e92949a..d84ac6a 100644
--- a/other/la_marseillaise/pipes.ly
+++ b/other/la_marseillaise/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/other/o_canada/pipes.ly b/other/o_canada/pipes.ly
index 58b75ad..f8d1542 100644
--- a/other/o_canada/pipes.ly
+++ b/other/o_canada/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/other/wilhelmus/lyrics.ly b/other/wilhelmus/lyrics.ly
index 9a0f9e7..108e833 100644
--- a/other/wilhelmus/lyrics.ly
+++ b/other/wilhelmus/lyrics.ly
@@ -1,5 +1,7 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 \include "notes.pipes.seconds.ily"
diff --git a/other/wilhelmus/pipes.full.ly b/other/wilhelmus/pipes.full.ly
index ebf317d..36a175b 100644
--- a/other/wilhelmus/pipes.full.ly
+++ b/other/wilhelmus/pipes.full.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 \include "notes.pipes.seconds.ily"
diff --git a/other/wilhelmus/pipes.ly b/other/wilhelmus/pipes.ly
index 3a6525a..4cc7eb0 100644
--- a/other/wilhelmus/pipes.ly
+++ b/other/wilhelmus/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/other/wilhelmus/pipes.seconds.ly b/other/wilhelmus/pipes.seconds.ly
index 9660721..c68bfcb 100644
--- a/other/wilhelmus/pipes.seconds.ly
+++ b/other/wilhelmus/pipes.seconds.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.seconds.ily"
 
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/His Father's Lament for Donald MacKenzie.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/His Father's Lament for Donald MacKenzie.ly
new file mode 100644
index 0000000..e7086ec
--- /dev/null
+++ b/piobaireachd/his_fathers_lament_for_donald_mackenzie/His Father's Lament for Donald MacKenzie.ly	
@@ -0,0 +1,172 @@
+\include "bagpipe.ly"
+melody = {
+		\set Staff.midiInstrument = #"bagpipe"
+		\hideKeySignature
+		\cadenzaOn
+		\once \override Score.BreakAlignment #'break-align-orders =
+			#(make-vector 3 '(instrument-name
+									left-edge
+									ambitus
+									span-bar
+									breathing-sign
+									clef
+									key-signature
+									time-signature
+									staff-bar
+									custos
+									span-bar))
+		\time 4/4
+		\bar "|:" \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grg f8. [ e16 ] \grg c8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grg f8. [ e16 ] \grg c8 [ e8 ] \grd b4 a4 \bar ":|" \break
+ \bar "|." \grg f8. [ e16 ] \grg c8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grg f8. [ e16 ] \grg c8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grg f8. [ e16 ] \grg c8 [ e8 ] \grd b4 a4 \bar ".|" \break 
+ \bar "|." \grg f8. [ e16 ] \grg c8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grg f8. [ e16 ] \grg c8. [ f16 ] \grg e8. [ c16 ] \grg b8 [ e8 ] \bar "|"
+ \grg f8. [ e16 ] \grg c8 [ e8 ] \grd b4 a4 \bar ":|:" \break
+
+ \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ A4 c8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ A4 c8 [ e8 ] \grd b4 a4 \bar ":|" \break
+ \bar "|." A4 c8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ A4 c8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ A4 c8 [ e8 ] \grd b4 a4 \bar ".|" \break 
+ \bar "|." A4 c8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ A4 c8. [ f16 ] \grg e4 c8. [ A16 ] \bar "|"
+ e4 c8 [ e8 ] \grd b4 a4 \bar ":|:" \break
+
+ \set Score.repeatCommands = #'((volta "1"))  \grd \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \set Score.repeatCommands = #'((volta "2"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ c8. [ \gre a32 ] \grg c8. [ \gre a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
+ \grg f8. [ \grg a32 ] \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
+ \grg c8. [ \gre a32 ] \grg c8. [ \gre a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
+ \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg c8. [ \gre a32 ] \grg b8. [ \gre a32 ] \bar ":|" \break
+ \bar "|." \grg f8. [ \grg a32 ] \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
+ \grg c8. [ \gre a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
+ \grg f8. [ \grg a32 ] \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
+ \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg c8. [ \gre a32 ] \grg b8. [ \gre a32 ] \bar ".|" \break 
+ \bar "|." \grg f8. [ \grg a32 ] \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
+ \grg c8. [ \gre a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
+ A8. [ a32 ] \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] A8. [ a32 ] \bar "|"
+ \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg c8. [ \gre a32 ] \grg b8. [ \gre a32 ] \bar ":|:" \break
+
+ \grg c8. [ \gre c32 ] \grg c8. [ \gre c32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
+ \grg f8. [ \grg f32 ] \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
+ \grg c8. [ \gre c32 ] \grg c8. [ \gre c32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
+ \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg c8. [ \gre c32 ] \grg b8. [ \gre b32 ] \bar ":|" \break
+ \bar "|." \grg f8. [ \grg f32 ] \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
+ \grg c8. [ \gre c32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
+ \grg f8. [ \grg f32 ] \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
+ \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg c8. [ \gre c32 ] \grg b8. [ \gre b32 ] \bar ".|" \break 
+ \bar "|." \grg f8. [ \grg f32 ] \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
+ \grg c8. [ \gre c32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
+ A8. [ \grg A32 ] f8. [ \grg f32 ] \grg e8. [ \grf e16 ] A8. [ \grg A32 ] \bar "|"
+ f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg c8. [ \gre c32 ] \grg b8. [ \gre b32 ] \bar ":|:" \break
+
+ \grg a8. [ \grd c16 ] \grg a16 [ \grd c8. ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grg a8. [ f16 ] \grg a16 [ f8. ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grg a8. [ \grd c16 ] \grg a16 [ \grd c8. ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grg a8. [ f16 ] \grg a16 [ e8. ] \grd b4 a4 \bar ":|:" \break
+
+ \grg a8. [ f16 ] \grg a16 [ f8. ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grg a8. [ \grd c16 ] \grg a16 [ \grd c8. ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  \grg a8. [ f16 ] \grg a16 [ f8. ] \grg e32 [ \gra e8. ] \echoa e4 \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "2"))  \grg a8. [ A16 ] a16 [ f8. ] \grg a8. [ e16 ] \grg a16 [ A8. ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ a8. [ f16 ] \grg a16 [ e8. ] \grd b4 a4 \bar ":|:" \break
+
+ \grg a32 [ \grd c8. ] \grg a32 [ \grd c8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \bar "|"
+ \grg a32 [ f8. ] \grg a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \bar "|"
+ \grg a32 [ \grd c8. ] \grg a32 [ \grd c8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \bar "|"
+ \grg a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ \grd c8. ] \grg a32 [ \grd b8. ] \bar ":|:" \break
+
+ \grg a32 [ f8. ] \grg a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \bar "|"
+ \grg a32 [ \grd c8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  \grg a32 [ f8. ] \grg a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "2"))  \grg a32 [ A8. ] a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ A8. ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ \grd c8. ] \grg a32 [ \grd b8. ] \bar ":|:" \break
+
+ \grd c4 \taor a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ f4 a8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grd c4 \taor a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ f4 a16 [ e8. ] \grd b4 a4 \bar ":|:" \break
+
+ f4 a8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grd c4 \taor a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  f4 a8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "2"))  A4 a8. [ f16 ] e4 a8. [ A16 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ f4 \taor a16 [ e8. ] \grd b4 a4 \bar ":|:" \break
+
+ c4 a8. [ \grd c16 ] e4 a8. [ e16 ] \bar "|"
+ f4 a8. [ f16 ] e4 a8. [ e16 ] \bar "|"
+ c4 a8. [ \grd c16 ] e4 a8. [ e16 ] \bar "|"
+ f4 a8. [ e16 ] c4 a8. [ \grd b16 ] \bar ":|:" \break
+
+ f4 a8. [ f16 ] e4 a8. [ e16 ] \bar "|"
+ c4 a8. [ \grd c16 ] e4 a8. [ e16 ] \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  f4 a8. [ f16 ] e4 a8. [ e16 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "2"))  A4 a8. [ f16 ] e4 a8. [ A16 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ f4 \taor a8. [ e16 ] c4 a8. [ \grd b16 ] \bar ":|:" \break
+
+ ( \grd c4 ) e8 [ a8 ( \grd c8 ] ) \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ f4 a8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ ( \grd c4 ) e8 [ a8 ( \grd c8 ] ) \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ f4 a8 [ e8 ] \grd b4 a4 \bar ":|:" \break
+
+ f4 a8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ ( \grd c4 ) e8 [ a8 ( \grd c8 ] ) \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  f4 a8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "2"))  A4 a8 [ f8 ] e4 a8 [ A8 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ f4 e8 [ a8 e8 ] \grd b4 a4 \bar ":|:" \break
+
+ c4 a8 [ \grd c16 ] e4 a8 [ e16 ] \bar "|"
+ f4 a8 [ f16 ] e4 a8 [ e16 ] \bar "|"
+ c4 a8 [ \grd c16 ] e4 a8 [ e16 ] \bar "|"
+ f4 a8 [ e16 ] c4 a8 [ \grd b16 ] \bar ":|:" \break
+
+ f4 a8 [ f16 ] e4 a8 [ e16 ] \bar "|"
+ c4 a8 [ \grd c16 ] e4 a8 [ e16 ] \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  f4 a8 [ f16 ] e4 a8 [ e16 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "2"))  A4 a8 [ f16 ] e4 a8 [ A16 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ f4 e8 [ a8 e16 ] c4 a8 [ \grd b16 ] \bar ":|" \break
+
+			}
+
+\score {
+	\melody
+	\layout {
+	indent = 0.0\cm
+	\context { \Score \remove "Bar_number_engraver" }
+	}
+	\header {
+	title = "His Father's Lament for Donald MacKenzie"
+	meter = "John Ban MacKenzie, 1863"
+	arranger = "I. GROUND"
+	}
+	
+}
+
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var10.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var10.ly
new file mode 100644
index 0000000..cf7169f
--- /dev/null
+++ b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var10.ly
@@ -0,0 +1,48 @@
+\include "bagpipe.ly"
+melody = {
+		\set Staff.midiInstrument = #"bagpipe"
+		\hideKeySignature
+		\cadenzaOn
+		\once \override Score.BreakAlignment #'break-align-orders =
+			#(make-vector 3 '(instrument-name
+									left-edge
+									ambitus
+									span-bar
+									breathing-sign
+									clef
+									key-signature
+									time-signature
+									staff-bar
+									custos
+									span-bar))
+		\time 4/4
+		\bar "|:" c4 a8 [ \grd c16 ] e4 a8 [ e16 ] \bar "|"
+ f4 a8 [ f16 ] e4 a8 [ e16 ] \bar "|"
+ c4 a8 [ \grd c16 ] e4 a8 [ e16 ] \bar "|"
+ f4 a8 [ e16 ] c4 a8 [ \grd b16 ] \bar ":|:" \break
+
+ f4 a8 [ f16 ] e4 a8 [ e16 ] \bar "|"
+ c4 a8 [ \grd c16 ] e4 a8 [ e16 ] \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  f4 a8 [ f16 ] e4 a8 [ e16 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "2"))  A4 a8 [ f16 ] e4 a8 [ A16 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ f4 e8 [ a8 e16 ] c4 a8 [ \grd b16 ] \bar ":|" \break
+
+			}
+
+\score {
+	\melody
+	\layout {
+	indent = 0.0\cm
+	\context { \Score \remove "Bar_number_engraver" }
+	}
+	\header {
+	title = "His Father's Lament for Donald MacKenzie"
+	meter = "John Ban MacKenzie, 1863"
+	arranger = "X. CRUNLUATH DOUBLING"
+	}
+	
+}
+
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var2.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var2.ly
new file mode 100644
index 0000000..2a1d5f9
--- /dev/null
+++ b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var2.ly
@@ -0,0 +1,47 @@
+\include "bagpipe.ly"
+melody = {
+		\set Staff.midiInstrument = #"bagpipe"
+		\hideKeySignature
+		\cadenzaOn
+		\once \override Score.BreakAlignment #'break-align-orders =
+			#(make-vector 3 '(instrument-name
+									left-edge
+									ambitus
+									span-bar
+									breathing-sign
+									clef
+									key-signature
+									time-signature
+									staff-bar
+									custos
+									span-bar))
+		\time 4/4
+		\bar "|:" \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ A4 c8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ A4 c8 [ e8 ] \grd b4 a4 \bar ":|" \break
+ \bar "|." A4 c8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ A4 c8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ A4 c8 [ e8 ] \grd b4 a4 \bar ".|" \break 
+ \bar "|." A4 c8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ A4 c8. [ f16 ] \grg e4 c8. [ A16 ] \bar "|"
+ e4 c8 [ e8 ] \grd b4 a4 \bar ".|" \break 
+
+			}
+
+\score {
+	\melody
+	\layout {
+	indent = 0.0\cm
+	\context { \Score \remove "Bar_number_engraver" }
+	}
+	\header {
+	title = "His Father's Lament for Donald MacKenzie"
+	meter = "John Ban MacKenzie, 1863"
+	arranger = "II. VAR. I"
+	}
+	
+}
+
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var3.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var3.ly
new file mode 100644
index 0000000..84a9bf3
--- /dev/null
+++ b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var3.ly
@@ -0,0 +1,49 @@
+\include "bagpipe.ly"
+melody = {
+		\set Staff.midiInstrument = #"bagpipe"
+		\hideKeySignature
+		\cadenzaOn
+		\once \override Score.BreakAlignment #'break-align-orders =
+			#(make-vector 3 '(instrument-name
+									left-edge
+									ambitus
+									span-bar
+									breathing-sign
+									clef
+									key-signature
+									time-signature
+									staff-bar
+									custos
+									span-bar))
+		\time 4/4
+		\bar "|:" \set Score.repeatCommands = #'((volta "1"))  \grd \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \set Score.repeatCommands = #'((volta "2"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ c8. [ \gre a32 ] \grg c8. [ \gre a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
+ \grg f8. [ \grg a32 ] \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
+ \grg c8. [ \gre a32 ] \grg c8. [ \gre a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
+ \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg c8. [ \gre a32 ] \grg b8. [ \gre a32 ] \bar ":|" \break
+ \bar "|." \grg f8. [ \grg a32 ] \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
+ \grg c8. [ \gre a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
+ \grg f8. [ \grg a32 ] \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
+ \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg c8. [ \gre a32 ] \grg b8. [ \gre a32 ] \bar ".|" \break 
+ \bar "|." \grg f8. [ \grg a32 ] \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
+ \grg c8. [ \gre a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
+ A8. [ a32 ] \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] A8. [ a32 ] \bar "|"
+ \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg c8. [ \gre a32 ] \grg b8. [ \gre a32 ] \bar ".|" \break 
+
+			}
+
+\score {
+	\melody
+	\layout {
+	indent = 0.0\cm
+	\context { \Score \remove "Bar_number_engraver" }
+	}
+	\header {
+	title = "His Father's Lament for Donald MacKenzie"
+	meter = "John Ban MacKenzie, 1863"
+	arranger = "III. VAR. II"
+	}
+	
+}
+
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var4.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var4.ly
new file mode 100644
index 0000000..e1dc71c
--- /dev/null
+++ b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var4.ly
@@ -0,0 +1,47 @@
+\include "bagpipe.ly"
+melody = {
+		\set Staff.midiInstrument = #"bagpipe"
+		\hideKeySignature
+		\cadenzaOn
+		\once \override Score.BreakAlignment #'break-align-orders =
+			#(make-vector 3 '(instrument-name
+									left-edge
+									ambitus
+									span-bar
+									breathing-sign
+									clef
+									key-signature
+									time-signature
+									staff-bar
+									custos
+									span-bar))
+		\time 4/4
+		\bar "|:" \grg c8. [ \gre c32 ] \grg c8. [ \gre c32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
+ \grg f8. [ \grg f32 ] \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
+ \grg c8. [ \gre c32 ] \grg c8. [ \gre c32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
+ \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg c8. [ \gre c32 ] \grg b8. [ \gre b32 ] \bar ":|" \break
+ \bar "|." \grg f8. [ \grg f32 ] \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
+ \grg c8. [ \gre c32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
+ \grg f8. [ \grg f32 ] \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
+ \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg c8. [ \gre c32 ] \grg b8. [ \gre b32 ] \bar ".|" \break 
+ \bar "|." \grg f8. [ \grg f32 ] \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
+ \grg c8. [ \gre c32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
+ A8. [ \grg A32 ] f8. [ \grg f32 ] \grg e8. [ \grf e16 ] A8. [ \grg A32 ] \bar "|"
+ f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg c8. [ \gre c32 ] \grg b8. [ \gre b32 ] \bar ".|" \break 
+
+			}
+
+\score {
+	\melody
+	\layout {
+	indent = 0.0\cm
+	\context { \Score \remove "Bar_number_engraver" }
+	}
+	\header {
+	title = "His Father's Lament for Donald MacKenzie"
+	meter = "John Ban MacKenzie, 1863"
+	arranger = "IV. VAR. II DOUBLING"
+	}
+	
+}
+
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var5.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var5.ly
new file mode 100644
index 0000000..4f5bef6
--- /dev/null
+++ b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var5.ly
@@ -0,0 +1,48 @@
+\include "bagpipe.ly"
+melody = {
+		\set Staff.midiInstrument = #"bagpipe"
+		\hideKeySignature
+		\cadenzaOn
+		\once \override Score.BreakAlignment #'break-align-orders =
+			#(make-vector 3 '(instrument-name
+									left-edge
+									ambitus
+									span-bar
+									breathing-sign
+									clef
+									key-signature
+									time-signature
+									staff-bar
+									custos
+									span-bar))
+		\time 4/4
+		\bar "|:" \grg a8. [ \grd c16 ] \grg a16 [ \grd c8. ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grg a8. [ f16 ] \grg a16 [ f8. ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grg a8. [ \grd c16 ] \grg a16 [ \grd c8. ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grg a8. [ f16 ] \grg a16 [ e8. ] \grd b4 a4 \bar ":|:" \break
+
+ \grg a8. [ f16 ] \grg a16 [ f8. ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grg a8. [ \grd c16 ] \grg a16 [ \grd c8. ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  \grg a8. [ f16 ] \grg a16 [ f8. ] \grg e32 [ \gra e8. ] \echoa e4 \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "2"))  \grg a8. [ A16 ] a16 [ f8. ] \grg a8. [ e16 ] \grg a16 [ A8. ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ a8. [ f16 ] \grg a16 [ e8. ] \grd b4 a4 \bar ":|" \break
+
+			}
+
+\score {
+	\melody
+	\layout {
+	indent = 0.0\cm
+	\context { \Score \remove "Bar_number_engraver" }
+	}
+	\header {
+	title = "His Father's Lament for Donald MacKenzie"
+	meter = "John Ban MacKenzie, 1863"
+	arranger = "V. VAR. III"
+	}
+	
+}
+
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var6.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var6.ly
new file mode 100644
index 0000000..38748f7
--- /dev/null
+++ b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var6.ly
@@ -0,0 +1,48 @@
+\include "bagpipe.ly"
+melody = {
+		\set Staff.midiInstrument = #"bagpipe"
+		\hideKeySignature
+		\cadenzaOn
+		\once \override Score.BreakAlignment #'break-align-orders =
+			#(make-vector 3 '(instrument-name
+									left-edge
+									ambitus
+									span-bar
+									breathing-sign
+									clef
+									key-signature
+									time-signature
+									staff-bar
+									custos
+									span-bar))
+		\time 4/4
+		\bar "|:" \grg a32 [ \grd c8. ] \grg a32 [ \grd c8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \bar "|"
+ \grg a32 [ f8. ] \grg a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \bar "|"
+ \grg a32 [ \grd c8. ] \grg a32 [ \grd c8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \bar "|"
+ \grg a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ \grd c8. ] \grg a32 [ \grd b8. ] \bar ":|:" \break
+
+ \grg a32 [ f8. ] \grg a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \bar "|"
+ \grg a32 [ \grd c8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  \grg a32 [ f8. ] \grg a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "2"))  \grg a32 [ A8. ] a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ A8. ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ \grd c8. ] \grg a32 [ \grd b8. ] \bar ":|" \break
+
+			}
+
+\score {
+	\melody
+	\layout {
+	indent = 0.0\cm
+	\context { \Score \remove "Bar_number_engraver" }
+	}
+	\header {
+	title = "His Father's Lament for Donald MacKenzie"
+	meter = "John Ban MacKenzie, 1863"
+	arranger = "VI. VAR. III. DOUBLING"
+	}
+	
+}
+
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var7.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var7.ly
new file mode 100644
index 0000000..49d6ea6
--- /dev/null
+++ b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var7.ly
@@ -0,0 +1,48 @@
+\include "bagpipe.ly"
+melody = {
+		\set Staff.midiInstrument = #"bagpipe"
+		\hideKeySignature
+		\cadenzaOn
+		\once \override Score.BreakAlignment #'break-align-orders =
+			#(make-vector 3 '(instrument-name
+									left-edge
+									ambitus
+									span-bar
+									breathing-sign
+									clef
+									key-signature
+									time-signature
+									staff-bar
+									custos
+									span-bar))
+		\time 4/4
+		\bar "|:" \grd c4 \taor a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ f4 a8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grd c4 \taor a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ f4 a16 [ e8. ] \grd b4 a4 \bar ":|:" \break
+
+ f4 a8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grd c4 \taor a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  f4 a8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "2"))  A4 a8. [ f16 ] e4 a8. [ A16 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ f4 \taor a16 [ e8. ] \grd b4 a4 \bar ":|" \break
+
+			}
+
+\score {
+	\melody
+	\layout {
+	indent = 0.0\cm
+	\context { \Score \remove "Bar_number_engraver" }
+	}
+	\header {
+	title = "His Father's Lament for Donald MacKenzie"
+	meter = "John Ban MacKenzie, 1863"
+	arranger = "VII. TAORLUATH"
+	}
+	
+}
+
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var8.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var8.ly
new file mode 100644
index 0000000..0c8b44b
--- /dev/null
+++ b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var8.ly
@@ -0,0 +1,48 @@
+\include "bagpipe.ly"
+melody = {
+		\set Staff.midiInstrument = #"bagpipe"
+		\hideKeySignature
+		\cadenzaOn
+		\once \override Score.BreakAlignment #'break-align-orders =
+			#(make-vector 3 '(instrument-name
+									left-edge
+									ambitus
+									span-bar
+									breathing-sign
+									clef
+									key-signature
+									time-signature
+									staff-bar
+									custos
+									span-bar))
+		\time 4/4
+		\bar "|:" c4 a8. [ \grd c16 ] e4 a8. [ e16 ] \bar "|"
+ f4 a8. [ f16 ] e4 a8. [ e16 ] \bar "|"
+ c4 a8. [ \grd c16 ] e4 a8. [ e16 ] \bar "|"
+ f4 a8. [ e16 ] c4 a8. [ \grd b16 ] \bar ":|:" \break
+
+ f4 a8. [ f16 ] e4 a8. [ e16 ] \bar "|"
+ c4 a8. [ \grd c16 ] e4 a8. [ e16 ] \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  f4 a8. [ f16 ] e4 a8. [ e16 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "2"))  A4 a8. [ f16 ] e4 a8. [ A16 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ f4 \taor a8. [ e16 ] c4 a8. [ \grd b16 ] \bar ":|" \break
+
+			}
+
+\score {
+	\melody
+	\layout {
+	indent = 0.0\cm
+	\context { \Score \remove "Bar_number_engraver" }
+	}
+	\header {
+	title = "His Father's Lament for Donald MacKenzie"
+	meter = "John Ban MacKenzie, 1863"
+	arranger = "VIII. TAORLUATH DOUBLING"
+	}
+	
+}
+
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var9.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var9.ly
new file mode 100644
index 0000000..bd014fb
--- /dev/null
+++ b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var9.ly
@@ -0,0 +1,48 @@
+\include "bagpipe.ly"
+melody = {
+		\set Staff.midiInstrument = #"bagpipe"
+		\hideKeySignature
+		\cadenzaOn
+		\once \override Score.BreakAlignment #'break-align-orders =
+			#(make-vector 3 '(instrument-name
+									left-edge
+									ambitus
+									span-bar
+									breathing-sign
+									clef
+									key-signature
+									time-signature
+									staff-bar
+									custos
+									span-bar))
+		\time 4/4
+		\bar "|:" ( \grd c4 ) e8 [ a8 ( \grd c8 ] ) \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ f4 a8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ ( \grd c4 ) e8 [ a8 ( \grd c8 ] ) \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ f4 a8 [ e8 ] \grd b4 a4 \bar ":|:" \break
+
+ f4 a8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ ( \grd c4 ) e8 [ a8 ( \grd c8 ] ) \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  f4 a8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "2"))  A4 a8 [ f8 ] e4 a8 [ A8 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar "|"
+ \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ f4 e8 [ a8 e8 ] \grd b4 a4 \bar ":|" \break
+
+			}
+
+\score {
+	\melody
+	\layout {
+	indent = 0.0\cm
+	\context { \Score \remove "Bar_number_engraver" }
+	}
+	\header {
+	title = "His Father's Lament for Donald MacKenzie"
+	meter = "John Ban MacKenzie, 1863"
+	arranger = "IX. CRUNLUATH"
+	}
+	
+}
+
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/ground.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/ground.ly
new file mode 100644
index 0000000..a6f01a7
--- /dev/null
+++ b/piobaireachd/his_fathers_lament_for_donald_mackenzie/ground.ly
@@ -0,0 +1,49 @@
+\include "bagpipe.ly"
+melody = {
+		\set Staff.midiInstrument = #"bagpipe"
+		\hideKeySignature
+		\cadenzaOn
+		\once \override Score.BreakAlignment #'break-align-orders =
+			#(make-vector 3 '(instrument-name
+									left-edge
+									ambitus
+									span-bar
+									breathing-sign
+									clef
+									key-signature
+									time-signature
+									staff-bar
+									custos
+									span-bar))
+		\time 4/4
+		\bar "|:" \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grg f8. [ e16 ] \grg c8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grg f8. [ e16 ] \grg c8 [ e8 ] \grd b4 a4 \bar ":|" \break
+ \bar "|." \grg f8. [ e16 ] \grg c8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grg f8. [ e16 ] \grg c8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grg f8. [ e16 ] \grg c8 [ e8 ] \grd b4 a4 \bar ".|" \break 
+ \bar "|." \grg f8. [ e16 ] \grg c8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
+ \grg f8. [ e16 ] \grg c8. [ f16 ] \grg e8. [ c16 ] \grg b8 [ e8 ] \bar "|"
+ \grg f8. [ e16 ] \grg c8 [ e8 ] \grd b4 a4 \bar ".|" \break 
+ \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ f4 e8 [ a8 e16 ] c4 a8 [ \grd b16 ] \bar ":|" \break
+
+			}
+
+\score {
+	\melody
+	\layout {
+	indent = 0.0\cm
+	\context { \Score \remove "Bar_number_engraver" }
+	}
+	\header {
+	title = "His Father's Lament for Donald MacKenzie"
+	meter = "John Ban MacKenzie, 1863"
+	arranger = "I. GROUND"
+	}
+	
+}
+
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/his_fathers_lament_for_donald_mackenzie.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/his_fathers_lament_for_donald_mackenzie.ly
new file mode 120000
index 0000000..1804ecc
--- /dev/null
+++ b/piobaireachd/his_fathers_lament_for_donald_mackenzie/his_fathers_lament_for_donald_mackenzie.ly
@@ -0,0 +1 @@
+../../../bagpipemusic/piobaireachd/his_fathers_lament_for_donald_mackenzie.ly
\ No newline at end of file
diff --git a/reels/cabar_feidh/pipes.ly b/reels/cabar_feidh/pipes.ly
index 8a0eb7a..c0c835c 100644
--- a/reels/cabar_feidh/pipes.ly
+++ b/reels/cabar_feidh/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/reels/jock_wilsons_ball/bass.ly b/reels/jock_wilsons_ball/bass.ly
index 90227c2..e570060 100644
--- a/reels/jock_wilsons_ball/bass.ly
+++ b/reels/jock_wilsons_ball/bass.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 
diff --git a/reels/jock_wilsons_ball/drums.ly b/reels/jock_wilsons_ball/drums.ly
index 4a7fff8..3cf925e 100644
--- a/reels/jock_wilsons_ball/drums.ly
+++ b/reels/jock_wilsons_ball/drums.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/reels/jock_wilsons_ball/full.ly b/reels/jock_wilsons_ball/full.ly
index e38326a..ee78e9e 100644
--- a/reels/jock_wilsons_ball/full.ly
+++ b/reels/jock_wilsons_ball/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/reels/jock_wilsons_ball/pipes.ly b/reels/jock_wilsons_ball/pipes.ly
index a7b2958..4c5a6af 100644
--- a/reels/jock_wilsons_ball/pipes.ly
+++ b/reels/jock_wilsons_ball/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/reels/jock_wilsons_ball/side.ly b/reels/jock_wilsons_ball/side.ly
index 3120dd3..5e79726 100644
--- a/reels/jock_wilsons_ball/side.ly
+++ b/reels/jock_wilsons_ball/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/reels/jock_wilsons_ball/tenor.ly b/reels/jock_wilsons_ball/tenor.ly
index d0311e4..d6409d0 100644
--- a/reels/jock_wilsons_ball/tenor.ly
+++ b/reels/jock_wilsons_ball/tenor.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.tenor.ily"
 
diff --git a/reels/piobaireachd_of_donald_dubh/pipes.ly b/reels/piobaireachd_of_donald_dubh/pipes.ly
index ac72d46..da50df0 100644
--- a/reels/piobaireachd_of_donald_dubh/pipes.ly
+++ b/reels/piobaireachd_of_donald_dubh/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/reels/the_mackenzies_reel/full.ly b/reels/the_mackenzies_reel/full.ly
index 3f8732d..f16d69b 100644
--- a/reels/the_mackenzies_reel/full.ly
+++ b/reels/the_mackenzies_reel/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 %\include "notes.bass.ily"
 %\include "notes.tenor.ily"
diff --git a/reels/the_mackenzies_reel/pipes.ly b/reels/the_mackenzies_reel/pipes.ly
index 0501606..ab20504 100644
--- a/reels/the_mackenzies_reel/pipes.ly
+++ b/reels/the_mackenzies_reel/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/reels/the_mackenzies_reel/side.ly b/reels/the_mackenzies_reel/side.ly
index c65e15d..7668f07 100644
--- a/reels/the_mackenzies_reel/side.ly
+++ b/reels/the_mackenzies_reel/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/strathspeys/aa_camerons/side.ly b/strathspeys/aa_camerons/side.ly
index c7c9876..70b7b32 100644
--- a/strathspeys/aa_camerons/side.ly
+++ b/strathspeys/aa_camerons/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/strathspeys/cabar_feidh/pipes.ly b/strathspeys/cabar_feidh/pipes.ly
index eeeff02..95aa8d0 100644
--- a/strathspeys/cabar_feidh/pipes.ly
+++ b/strathspeys/cabar_feidh/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/strathspeys/keel_row/pipes.ly b/strathspeys/keel_row/pipes.ly
index a5f7b6a..d9bfe6c 100644
--- a/strathspeys/keel_row/pipes.ly
+++ b/strathspeys/keel_row/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/strathspeys/lady_mackenzie_of_fairburn/bass.ly b/strathspeys/lady_mackenzie_of_fairburn/bass.ly
index 649db5e..efad1bf 100644
--- a/strathspeys/lady_mackenzie_of_fairburn/bass.ly
+++ b/strathspeys/lady_mackenzie_of_fairburn/bass.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 
diff --git a/strathspeys/lady_mackenzie_of_fairburn/drums.ly b/strathspeys/lady_mackenzie_of_fairburn/drums.ly
index fe6eee2..9dcd5b3 100644
--- a/strathspeys/lady_mackenzie_of_fairburn/drums.ly
+++ b/strathspeys/lady_mackenzie_of_fairburn/drums.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/strathspeys/lady_mackenzie_of_fairburn/full.ly b/strathspeys/lady_mackenzie_of_fairburn/full.ly
index ffcdbce..74f61b2 100644
--- a/strathspeys/lady_mackenzie_of_fairburn/full.ly
+++ b/strathspeys/lady_mackenzie_of_fairburn/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/strathspeys/lady_mackenzie_of_fairburn/pipes.ly b/strathspeys/lady_mackenzie_of_fairburn/pipes.ly
index 9ebb77a..18ec0bb 100644
--- a/strathspeys/lady_mackenzie_of_fairburn/pipes.ly
+++ b/strathspeys/lady_mackenzie_of_fairburn/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/strathspeys/lady_mackenzie_of_fairburn/side.ly b/strathspeys/lady_mackenzie_of_fairburn/side.ly
index 733b551..fa55a8b 100644
--- a/strathspeys/lady_mackenzie_of_fairburn/side.ly
+++ b/strathspeys/lady_mackenzie_of_fairburn/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/strathspeys/lady_mackenzie_of_fairburn/tenor.ly b/strathspeys/lady_mackenzie_of_fairburn/tenor.ly
index 896c011..03f2f2c 100644
--- a/strathspeys/lady_mackenzie_of_fairburn/tenor.ly
+++ b/strathspeys/lady_mackenzie_of_fairburn/tenor.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.tenor.ily"
 
diff --git a/strathspeys/molly_connell/bass.ly b/strathspeys/molly_connell/bass.ly
index 5377e71..39442a3 100644
--- a/strathspeys/molly_connell/bass.ly
+++ b/strathspeys/molly_connell/bass.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 
diff --git a/strathspeys/molly_connell/drums.ly b/strathspeys/molly_connell/drums.ly
index 31008a2..af77198 100644
--- a/strathspeys/molly_connell/drums.ly
+++ b/strathspeys/molly_connell/drums.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/strathspeys/molly_connell/full.ly b/strathspeys/molly_connell/full.ly
index 76dc01d..a538da9 100644
--- a/strathspeys/molly_connell/full.ly
+++ b/strathspeys/molly_connell/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/strathspeys/molly_connell/pipes.ly b/strathspeys/molly_connell/pipes.ly
index 4ef122a..9a0e307 100644
--- a/strathspeys/molly_connell/pipes.ly
+++ b/strathspeys/molly_connell/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/strathspeys/molly_connell/side.ly b/strathspeys/molly_connell/side.ly
index 2169f64..b8584b1 100644
--- a/strathspeys/molly_connell/side.ly
+++ b/strathspeys/molly_connell/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/strathspeys/molly_connell/tenor.ly b/strathspeys/molly_connell/tenor.ly
index 7fc6955..4ad82d2 100644
--- a/strathspeys/molly_connell/tenor.ly
+++ b/strathspeys/molly_connell/tenor.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.tenor.ily"
 
diff --git a/template/bass.ly b/template/bass.ly
index 39bfcb9..2bf8dd5 100644
--- a/template/bass.ly
+++ b/template/bass.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 
diff --git a/template/drums.ly b/template/drums.ly
index 77a537f..12fc4bd 100644
--- a/template/drums.ly
+++ b/template/drums.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/template/full.ly b/template/full.ly
index f4ead7a..4b41b4e 100644
--- a/template/full.ly
+++ b/template/full.ly
@@ -1,5 +1,11 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.bass.ily"
 \include "notes.tenor.ily"
diff --git a/template/pipes.full.ly b/template/pipes.full.ly
index 9078544..c209977 100644
--- a/template/pipes.full.ly
+++ b/template/pipes.full.ly
@@ -1,5 +1,9 @@
 \version "2.19.0"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 \include "notes.pipes.seconds.ily"
diff --git a/template/pipes.ly b/template/pipes.ly
index c6e74d6..5f160a2 100644
--- a/template/pipes.ly
+++ b/template/pipes.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.ily"
 
diff --git a/template/pipes.seconds.ly b/template/pipes.seconds.ly
index 9d454e7..d5ebfe9 100644
--- a/template/pipes.seconds.ly
+++ b/template/pipes.seconds.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.seconds.ily"
 
diff --git a/template/pipes.thirds.ly b/template/pipes.thirds.ly
index 3f4a220..9255f92 100644
--- a/template/pipes.thirds.ly
+++ b/template/pipes.thirds.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "bagpipe.ly"
+
+\include "bagpipe.ly"
+
 \include "config.ily"
 \include "notes.pipes.thirds.ily"
 
diff --git a/template/side.ly b/template/side.ly
index b23c0b7..836bb43 100644
--- a/template/side.ly
+++ b/template/side.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.side.ily"
 
diff --git a/template/tenor.ly b/template/tenor.ly
index b798898..101f0db 100644
--- a/template/tenor.ly
+++ b/template/tenor.ly
@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+\include "lilydrum.ly"
+
+\include "lilydrum.ly"
+
 \include "config.ily"
 \include "notes.tenor.ily"