diff --git a/6-8_marches/kilaloe/config.ily b/6-8_marches/kilaloe/config.ily
index 903ed31..1c8829a 100644
--- a/6-8_marches/kilaloe/config.ily
+++ b/6-8_marches/kilaloe/config.ily
@@ -7,9 +7,9 @@ confTempo = {
 	\tempo 4. = 80 
 	}
 %% Format
-part = { \partial 8 s8 }
-measure = { \grace {s4 } s1. | }
-halfline = { \repeat unfold 2 { \measure } }
+part = { \partial 8 \grace {s4} s8 }
+measure = { \grace {s4 } s2. | }
+halfline = { \repeat unfold 4 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
diff --git a/6-8_marches/kilaloe/full.ly b/6-8_marches/kilaloe/full.ly
new file mode 100644
index 0000000..523c1da
--- /dev/null
+++ b/6-8_marches/kilaloe/full.ly
@@ -0,0 +1,126 @@
+\version "2.19.0"
+
+\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 \with {
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
+			\global
+			\pipeglobal
+			<<
+				\new NullVoice = "format" {
+					\part
+					\line
+					\break
+					\line \bar "|."
+					\break
+					\line
+					\break
+					\line \bar "|."
+					\break
+					\repeat volta 2 {
+						\line
+						\break
+						\line
+						s4.
+					}
+					\alternative{ {\grace {s4} s4. } {\grace {s4} s4. } }
+					\bar "|."
+
+				}%Format
+
+				\new Voice = "pipes" {
+					\pipesA
+
+					\pipesB
+
+					\pipesC \pipesCBA \pipesCBB
+				}%Pipes
+			>>
+		}
+%		\new Staff = "song" {
+%  			\lyricsglobal
+%			\new Voice = "lyrics" {
+%				
+%			}
+%		}
+%		\new Lyrics = "verse1" {
+%		  \lyricsglobal
+%		  \lyricsto "lyrics" {
+%			\verseA
+%		  }
+%		}
+%		\new Staff = "seconds" \with {
+%			instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
+%			shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd }
+%		} {
+%			\pipessecndglobal
+%
+%
+%		}
+%		\new PipeBandDrumStaff = "side" \with {
+%			instrumentName = \markup { \instrumentSide }
+%			shortInstrumentName = \markup{ \shortInstrumentSide }
+%		} {
+%			\sideglobal
+%
+%		}
+		\new PipeBandDrumStaff = "tenor" \with {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
+			\tenorglobal
+
+			s8 \tenorA
+			\tenorA
+
+			\tenorB
+			\tenorB
+
+			\tenorCA
+			\tenorCB 
+			r4. | % Volta bracket for pipes
+		}
+%		\new PipeBandDrumStaff = "bass" \with {
+%			instrumentName = \markup{ \instrumentBass }
+%			shortInstrumentName = \markup{ \shortInstrumentBass }
+%		} {
+%			\bassglobal
+%
+%		}
+	>>
+	\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/6-8_marches/kilaloe/notes.pipes.ily b/6-8_marches/kilaloe/notes.pipes.ily
index 5bfd4ea..4027179 100644
--- a/6-8_marches/kilaloe/notes.pipes.ily
+++ b/6-8_marches/kilaloe/notes.pipes.ily
@@ -26,9 +26,11 @@ pipesA = {
 	\dblA A4 f8 \dblA A4 f8 |
 	\dble e4 g8 \grA f4 e8 |
 	\thrwd d2. |
-	\dbld d4. \grg a4. | 
-
-	\hslura g4 f8 \hslura g4 e8 |
+	\dbld d4. | 
+}
+pipesB = {
+	\grg a4. |
+	\dblg g4 f8 \dblg g4 e8 |
 	\thrwd d4. \gre a4. |
 	\dblA A4 f8 \dblA A4 f8 |
 	\dbld d4. \dbld d4 c8 | 
@@ -46,9 +48,17 @@ pipesA = {
 	\dblA A4 f8 \dblA A4 f8 |
 	\dble e4 g8 \grA f4 e8 |
 	\thrwd d2.~ |
-	d4. \grg a8 [ b8 c8 ] |
+	d4.
 }
-pipesB = {
+pipesCBA = {
+	\grg a8 [ b8 c8 ]
+}
+pipesCBB = {
+	\grg d4.
+}
+pipesC = {
+	\pipesCBA
+
 	\thrwd d4 c8 \thrwd d4 e8 |
 	\thrwd d4. \grg a8 [ b8 c8 ] |
 	\thrwd d4 c8 \thrwd d4 e8 |
@@ -66,13 +76,9 @@ pipesB = {
 
 	\dblA A4 f8 \slura g4 e8 |
 	\dblf f4 d8 A4.~ |
-	A4. A4 g8 |
+	A4.~ A4 g8 |
 	\grf f4 d8 \grg e4 c8 |
+	\thrwd d4.
 
 }
-pipesBBA = {
-	\thrwd d4. \grg a8 [ b8 c8 ]
-}
-pipesBBB = {
-	\thrwd d4. \grg d4.
-}
+
diff --git a/6-8_marches/kilaloe/notes.tenor.ily b/6-8_marches/kilaloe/notes.tenor.ily
new file mode 100644
index 0000000..df835fd
--- /dev/null
+++ b/6-8_marches/kilaloe/notes.tenor.ily
@@ -0,0 +1,29 @@
+% 6/8 Kilaloe
+% Tenor
+\version "2.18.2"
+composerTenor = ""
+arrangerTenor = ""
+tenorglobal = {}
+% Music
+tenorA = \drummode {
+	d4. g4. | d4. r4. | 
+	d4. g4. | d4. r4. |
+	d4. g4. | d8. g16 d8 g8. d16 g8 |
+	d4. g4. | d4. r4. |
+}
+tenorB = \drummode {
+	d4. g4. d4. g4. |
+	d4. g4. d4. r4. |
+	d4. g4. d8. g16 d8 g8. d16 g8 |
+	d4. g4. d4. r4. |
+}
+tenorCA = \drummode {
+	\tenorB
+}
+tenorCB = \drummode {
+	d4. g4. d4. r4. |
+	d4. g4. d4. r4. |
+	d4. g4. d8. g16 d8 g4. |
+	r4.^"Oii" r4. d4. g4. |
+	d4. r4. |
+}
diff --git a/6-8_marches/kilaloe/pipes.ly b/6-8_marches/kilaloe/pipes.ly
index 4473e98..5001ca8 100644
--- a/6-8_marches/kilaloe/pipes.ly
+++ b/6-8_marches/kilaloe/pipes.ly
@@ -14,7 +14,7 @@
 			\part
 			\line
 			\break
-			\line
+			\line \bar "|."
 			\break
 			\line
 			\break
@@ -24,19 +24,17 @@
 				\line
 				\break
 				\line
-				\break
-				\line
-				\break
-				\repeat unfold 3 { \measure }
+				s4.
 			}
-			\alternative{ { \measure} {\measure} }
+			\alternative{ {\grace{s4} s4.} {\grace{s4} s4.} }
 			\bar "|."
 			}%Format
 			{ 
 			\pipesA
 
-			\pipesB \pipesBBA
-			\pipesB \pipesBBB
+			\pipesB
+
+			\pipesC \pipesCBA \pipesCBB
 
 			}
 		>>
@@ -56,8 +54,9 @@
 		\partial 8
 		\pipesA
 
-		\pipesB	\pipesBBA
-		\pipesB	\pipesBBB
+		\pipesB
+
+		\pipesC	\pipesC	\pipesCBB
 		
 	}
 	\midi { \confTempo }
diff --git a/6-8_marches/kilaloe/pipes.n.ly b/6-8_marches/kilaloe/pipes.n.ly
new file mode 100644
index 0000000..9caf048
--- /dev/null
+++ b/6-8_marches/kilaloe/pipes.n.ly
@@ -0,0 +1,50 @@
+\version "2.18.2"
+
+\include "bagpipe.ly"
+
+\include "./config.ily"
+\include "./notes.pipes.ily"
+
+part = { \partial 4. \grace {s4} s4. }
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			{
+				\part
+				\line
+				\break
+				\line \bar "|."
+				\break
+				\part
+				\line
+				\break
+				\line \bar "|."
+				\break
+				\repeat volta 2 {
+					\part
+					\line
+					\break
+					\line
+					\measure
+				}
+			}%Format
+			{ 
+			r4 \pipesA s4.
+
+			\pipesB s4.
+
+			\pipesC s4.
+
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/6-8_marches/kilaloe/tenor.ly b/6-8_marches/kilaloe/tenor.ly
new file mode 100644
index 0000000..c50c174
--- /dev/null
+++ b/6-8_marches/kilaloe/tenor.ly
@@ -0,0 +1,41 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.tenor.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+		\global
+		\tenorglobal
+		<<
+			\new NullVoice = "format" {
+				\repeat volta 2 \line
+				\break
+				\repeat volta 2 \line
+				\break
+				
+				\line
+				\break
+				\line \measure \bar "|."
+			}%Format
+			
+			\new DrumVoice = "tenor" {
+				\tenorA
+
+				\tenorB
+
+				\tenorCA
+				\tenorCB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentTenor
+		composer = \composerTenor
+		arranger = \arrangerTenor
+	}
+}
diff --git a/airs/highland_cathedral/bass.ly b/airs/highland_cathedral/bass.ly
new file mode 100644
index 0000000..fd516e4
--- /dev/null
+++ b/airs/highland_cathedral/bass.ly
@@ -0,0 +1,48 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.bass.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+        \global
+		\bassglobal
+		<<
+			\new NullVoice = "format"
+			{
+				\repeat volta 2 {
+					\line
+				} \alternative {
+					\measure
+					{\measure \measure}
+				}
+				\bar "|."
+				\break
+				\line \bar "|."
+
+				\break
+				\mark \markup \small "HaFaBra"
+				\measure
+				\measure
+				\bar "|."
+			}%Format
+			\new DrumVoice { 
+				\repeat percent 9 \bassAA
+				\repeat unfold 2 \bassAA
+
+				\repeat percent 4 { \bassAA \bassAA }
+
+				\bassHafabraEnd
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentBass
+		composer = \composerBass
+		arranger = \arrangerBass
+	}
+}
diff --git a/airs/highland_cathedral/drums.ly b/airs/highland_cathedral/drums.ly
new file mode 100644
index 0000000..839e913
--- /dev/null
+++ b/airs/highland_cathedral/drums.ly
@@ -0,0 +1,92 @@
+\version "2.19.0"
+
+\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" {
+					\repeat volta 2 {
+						\line
+					} \alternative {
+						\measure
+						{\measure \measure}
+					}
+					\bar "|."
+					\break
+					\line \bar "|."
+
+					\break
+					\mark \markup \small "HaFaBra"
+					\measure
+					\measure
+					\bar "|."
+
+				}%End of Format
+				\new DrumVoice = "side" {
+					\repeat percent 9 {
+						\snareAA
+					}
+					\snareRolls
+					\repeat percent 3 \snareBA
+					\snareRolls
+
+					\snareHafabraEnd
+
+				}%End of side
+			>>
+		}
+		\new PipeBandDrumStaff = "tenor" {
+			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+				\repeat percent 9 {
+					\tenorAA
+				}
+				\tenorRolls
+				\repeat percent 4 \tenorBA
+
+				\tenorHafabraEnd
+
+		}
+		\new PipeBandDrumStaff = "bass" {
+			\bassglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+				\repeat percent 9 \bassAA
+				\repeat unfold 2 \bassAA
+
+				\repeat percent 4 { \bassAA \bassAA }
+
+				\bassHafabraEnd
+
+		}
+	>>
+	\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/airs/highland_cathedral/full.ly b/airs/highland_cathedral/full.ly
new file mode 100644
index 0000000..b43da77
--- /dev/null
+++ b/airs/highland_cathedral/full.ly
@@ -0,0 +1,138 @@
+\version "2.19.0"
+
+\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" {
+						\repeat unfold 2 {
+							\line
+							\bar "||"
+							\break
+							\line
+							\measure
+							\bar "|."
+						}
+
+						\break
+						\mark \markup "HaFaBra"
+						\measure
+						\measure
+						\bar "|."
+
+				}%Format
+
+				\new Voice = "pipes" {
+					\repeat unfold 2 {
+						{}\mark \markup \small "A"
+						\pipesA
+						{}\mark \markup \small "B"
+						\pipesB
+					}
+
+					\pipesHafabraEnd
+				}%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}
+					\repeat percent 15 {
+						\snareAA
+					}
+					\snareRolls
+
+					\snareB
+					\snareRolls
+
+					\snareHafabraEnd
+
+		}
+		\new PipeBandDrumStaff = "tenor" {
+			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+				\repeat percent 15 {
+					\tenorAA
+				}
+				\tenorRolls
+				\repeat percent 7 \tenorBA
+				\tenorAA
+				\tenorRolls
+
+				\tenorHafabraEnd
+
+		}
+		\new PipeBandDrumStaff = "bass" {
+			\bassglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+				\repeat percent 15 \bassAA
+				\bassRolls
+
+				\repeat percent 7 \bassBA
+				\bassAA
+				\bassRolls
+
+				\bassHafabraEnd
+
+		}
+	>>
+	\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/airs/highland_cathedral/notes.bass.ily b/airs/highland_cathedral/notes.bass.ily
new file mode 100644
index 0000000..2a23e7d
--- /dev/null
+++ b/airs/highland_cathedral/notes.bass.ily
@@ -0,0 +1,14 @@
+% 4/4 Highland Cathedral
+% Bass
+\version "2.18.2"
+composerBass  = ""
+arrangerBass  = ""
+bassglobal = {}
+% Music
+bassAA = \drummode {
+  d4 g d g |
+}
+bassRolls = \drummode {\repeat unfold 2 \bassAA}
+
+bassBA = \drummode { \repeat unfold 2 \bassAA }
+bassHafabraEnd = \drummode { \bassAA | d4 g d2:32\fermata }
diff --git a/airs/highland_cathedral/notes.pipes.ily b/airs/highland_cathedral/notes.pipes.ily
index 49a4d0d..89ca031 100644
--- a/airs/highland_cathedral/notes.pipes.ily
+++ b/airs/highland_cathedral/notes.pipes.ily
@@ -1,7 +1,7 @@
 % 4/4 Highland Cathedral
 % Pipes
 \version "2.18.2"
-composerPipes = "arr. Marc Goudswaart"
+composerPipes = "arr. Marc Gouswaart"
 pipeglobal = {
 	\bagpipeKey
 	}
diff --git a/airs/highland_cathedral/notes.side.ily b/airs/highland_cathedral/notes.side.ily
new file mode 100644
index 0000000..9c4e6e8
--- /dev/null
+++ b/airs/highland_cathedral/notes.side.ily
@@ -0,0 +1,44 @@
+% 4/4 Highland Cathedral
+% Side
+\version "2.18.2"
+composerSide = ""
+arrangerSide = ""
+sideglobal = {}
+% Music
+snareRolls = \drummode {
+	d1:32~
+	|
+	d2:32~ \<
+	d4.:32~\!\>
+	g8:32~\<
+	|
+}
+snareAA = \drummode {
+				\flam d8\! \triplet { d16 g d }
+				\flam g8 \triplet { d16 g d }
+				\flam g8 \triplet { d16 g d }
+				\flamg \triplet { g16 d g } 	\flamd \triplet { d16 g d }
+				|
+}
+snareBA = \drummode {
+		\snareAA
+		|
+		\flam d8 \triplet { d16 g d }
+		\flam g8 \triplet { d16 g d }
+		\flam g8 \triplet { d16 g d }
+		\flamg \triplet { g8 \flam d \flam g }
+		|
+}
+snareB = \drummode {
+	\repeat percent 7 \snareBA
+	\snareAA
+
+}
+
+snareHafabraEnd = \drummode {
+	\repeat unfold 4 { \flam g8 \triplet { d16 g d } }
+	|
+	\flam d8 \flam g
+	\flam d8 \flam g
+	d2:32\fermata
+}
diff --git a/airs/highland_cathedral/notes.tenor.ily b/airs/highland_cathedral/notes.tenor.ily
new file mode 100644
index 0000000..ab9f053
--- /dev/null
+++ b/airs/highland_cathedral/notes.tenor.ily
@@ -0,0 +1,38 @@
+% 4/4 Highland Cathedral
+% Tenor
+\version "2.18.2"
+composerTenor = ""
+arrangerTenor = ""
+tenorglobal = {}
+% Music
+tenorRolls = \drummode {
+	d1:16~
+	d1:16~
+}
+tenorAA = \drummode {
+		d8 \triplet { g16 d g }
+		d8 \triplet { g16 d g }
+		d8 \triplet { g16 d g }
+		d8 g
+		|
+}
+tenorBA = \drummode {
+		\tenorAA
+		|
+		d8 \triplet { g16 d g }
+		d8 \triplet { g16 d g }
+		d8 \triplet { g16 d g }
+		\triplet { g8  d  g }
+		|
+}
+tenorB = \drummode {
+	\repeat percent 3 \tenorBA
+	\tenorAA
+}
+tenorHafabraEnd = \drummode {
+	\repeat unfold 4 { d8 \triplet { g16 d g } }
+	|
+	d8[ g]
+	d8[ g]
+	d2:16\fermata
+}
diff --git a/airs/highland_cathedral/side.ly b/airs/highland_cathedral/side.ly
new file mode 100644
index 0000000..931ef73
--- /dev/null
+++ b/airs/highland_cathedral/side.ly
@@ -0,0 +1,51 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.side.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+        \global
+		\sideglobal
+		<<
+			\new NullVoice = "format" {
+				\repeat volta 2 {
+					\line
+				} \alternative {
+					\measure
+					{\measure \measure}
+				}
+				\bar "|."
+				\break
+				\line \bar "|."
+
+				\break
+				\mark \markup \small "HaFaBra"
+				\measure
+				\measure
+				\bar "|."
+			}%Format
+			
+			\new DrumVoice = "side" {
+				\repeat percent 9 {
+					\snareAA
+				}
+				\snareRolls
+				\repeat percent 3 \snareBA
+				\snareRolls
+
+				\snareHafabraEnd
+
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentSide
+		composer = \composerSide
+		arranger = \arrangerSide
+	}
+}
diff --git a/airs/highland_cathedral/tenor.ly b/airs/highland_cathedral/tenor.ly
new file mode 100644
index 0000000..d615beb
--- /dev/null
+++ b/airs/highland_cathedral/tenor.ly
@@ -0,0 +1,50 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.tenor.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+	\global
+	\tenorglobal
+	<<
+			\new NullVoice = "format" {
+				\repeat volta 2 {
+					\line
+				} \alternative {
+					\measure
+					{\measure \measure}
+				}
+				\bar "|."
+				\break
+				\line \bar "|."
+
+				\break
+				\mark \markup \small "HaFaBra"
+				\measure
+				\measure
+				\bar "|."
+		
+			}%Format
+			
+			\new DrumVoice = "tenor" {
+				\repeat percent 9 {
+					\tenorAA
+				}
+				\tenorRolls
+				\repeat percent 4 \tenorBA
+
+				\tenorHafabraEnd
+			}
+	>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentTenor
+		composer = \composerTenor
+		arranger = \arrangerTenor
+	}
+}
diff --git a/airs/road_to_the_isles/config.ily b/airs/road_to_the_isles/config.ily
new file mode 100644
index 0000000..57b5f1d
--- /dev/null
+++ b/airs/road_to_the_isles/config.ily
@@ -0,0 +1,17 @@
+\version "2.19.0"
+%% Globals
+global = {
+	\time 2/4
+	}
+confTempo = { 
+	\tempo 4 = 50 
+	}
+%% Format
+part = { \partial 8 \grace{s4.} s8 }
+measure = { \grace {s1} s2 | }
+halfline = { \repeat unfold 4 \measure }
+line = { \repeat unfold 2 { \halfline } }
+
+%% Headers
+title = "Road to the Isles"
+meter = "Slow March"
diff --git a/airs/road_to_the_isles/notes.side.ily b/airs/road_to_the_isles/notes.side.ily
new file mode 100644
index 0000000..8b38ddf
--- /dev/null
+++ b/airs/road_to_the_isles/notes.side.ily
@@ -0,0 +1,54 @@
+% 2/4 Road to the Isles
+% Side
+\version "2.18.2"
+composerSide = "E.T. de Boone, 23/05/2017"
+arrangerSide = ""
+sideglobal = { \eighthBeaming \set strictBeatBeaming = ##t}
+% Music
+sideMid = \drummode {  
+  d16. g32 |
+  d16.:64([ d32) \tuplet 3/2 { g16 d g] }	\flam d16.[ \drag g32 \tuplet 5/2 { d16 g d g d] } |
+  g8 d8:32( d8)
+}
+sideMidTwo = \drummode {
+  d16. g32 |
+  d16.-> g32 d16. g32->  d16. g32-> d16. g32 |
+  d8-> d8:32( d8)
+}
+sideEnd = \drummode {
+  d16. g32 |
+  \dragd \tuplet 3/2 { d16[ d g } \drag d16. g32] 	\flam d16.[ \drag g32 \tuplet 5/2 { d16 g d g d] } |
+  g8 d8:32( d8)
+}
+sideEndTwo = \drummode {
+  g8 |
+  \flam d8 \flam g	\flam d16. g32 d16. g32 |
+  d4:32( d8)
+}
+% parts
+sideA = \drummode {
+  d16. g32 |
+  d4:32(	d16.) g32 \tuplet 3/2 { d16 g d } |
+  \flam g8 d8:32(	d8)
+
+  \sideMid
+
+  d16. g32 |
+  d4:32(	d16.) g32 \tuplet 3/2 { d16 g d } |
+  \flam g16. d32-> g16. g32 	\flam d8
+
+  \sideEnd
+}
+sideB = \drummode {
+  d16. g32 |
+  d16.:64(-> d32) \tuplet 3/2 { g16 d g }	d16.:64(-> d32) \tuplet 3/2 { g16 d g } |
+  d16.:64(-> d32) g16.:64(-> g32)	d8
+
+  \sideMid
+
+  d16. g32 |
+  d16.:64(-> d32) \tuplet 3/2 { g16 d g }	d16.:64(-> d32) \tuplet 3/2 { g16 d g } |
+  d16.:64(-> d32) g16.:64(-> g32)	d8
+
+  \sideEnd
+}
diff --git a/airs/road_to_the_isles/side.full.ly b/airs/road_to_the_isles/side.full.ly
new file mode 100644
index 0000000..2367939
--- /dev/null
+++ b/airs/road_to_the_isles/side.full.ly
@@ -0,0 +1,74 @@
+\version "2.19.0"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.side.ily"
+
+\score {
+	\new StaffGroup <<
+		\new PipeBandDrumStaff = "side" \with {
+			instrumentName = \markup{ \instrumentSide }
+			shortInstrumentName = \markup{ \shortInstrumentSide }
+		} {
+			\global
+			\sideglobal
+			<<
+				\new NullVoice = "format" {
+					\repeat volta 2 {
+					\part
+					\line
+				}
+				\break
+				\repeat volta 2 {
+					\part
+					\line
+				}
+				
+				}%End of Format
+				\new DrumVoice = "side" {
+					\sideA s8
+
+					\sideB s8
+				}%End of side
+			>>
+		}
+		\new PipeBandDrumStaff = "side2" \with {
+			instrumentName = \markup{ \instrumentSide 2 }
+			shortInstrumentName = \markup{ \shortInstrumentSide 2}
+		} {
+				s8 |
+				s2 |
+				s4 s8
+				\sideMidTwo
+				s8 |
+				s2 |
+				s4 s8
+				\sideEndTwo
+				s8
+			
+				
+				s8 |
+				s2 |
+				s4 s8
+				\sideMidTwo
+				s8 |
+				s2 |
+				s4 s8
+				\sideEndTwo
+				s8
+		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup {
+			\column \right-align {
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+			}
+		}
+	}
+}
diff --git a/airs/road_to_the_isles/side.ly b/airs/road_to_the_isles/side.ly
new file mode 100644
index 0000000..e9111ec
--- /dev/null
+++ b/airs/road_to_the_isles/side.ly
@@ -0,0 +1,39 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.side.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+        \global
+		\sideglobal
+		<<
+			\new NullVoice = "format" {
+				\repeat volta 2 {
+					\part
+					\line
+				}
+				\break
+				\repeat volta 2 {
+					\part
+					\line
+				}
+			}%Format
+			
+			\new DrumVoice = "side" {
+				\sideA s8
+
+				\sideB s8
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentSide
+		composer = \composerSide
+		arranger = \arrangerSide
+	}
+}
diff --git a/airs/road_to_the_isles/side.two.ly b/airs/road_to_the_isles/side.two.ly
new file mode 100644
index 0000000..e9c0786
--- /dev/null
+++ b/airs/road_to_the_isles/side.two.ly
@@ -0,0 +1,61 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.side.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+        \global
+		\sideglobal
+		<<
+			\new NullVoice = "format" {
+				\repeat volta 2 {
+					\part
+					\line
+				}
+				\break
+				\repeat volta 2 {
+					\part
+					\line
+				}
+			}%Format
+			
+			\new DrumVoice = "side" {
+				d16. g32 |
+				d4:32(	d16.) g32 \tuplet 3/2 { d16 g d } |
+				\flam g8 d8:32(	d8)
+
+				\sideMidTwo
+
+				d16. g32 |
+				d4:32(	d16.) g32 \tuplet 3/2 { d16 g d } |
+				\flam g16. d32-> g16. g32 	\flam d8
+
+				\sideEndTwo s8
+
+
+
+				d16. g32 |
+				d16.:64(-> d32) \tuplet 3/2 { g16 d g }	d16.:64(-> d32) \tuplet 3/2 { g16 d g } |
+				d16.:64(-> d32) g16.:64(-> g32)	d8
+				
+				\sideMidTwo
+				
+				d16. g32 |
+				d16.:64(-> d32) \tuplet 3/2 { g16 d g }	d16.:64(-> d32) \tuplet 3/2 { g16 d g } |
+				d16.:64(-> d32) g16.:64(-> g32)	d8
+				
+				\sideEndTwo s8
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = #(string-append instrumentSide " 2")
+		composer = \composerSide
+		arranger = \arrangerSide
+	}
+}
diff --git a/defs/layout.ily b/defs/layout.ily
index 803700a..ef37071 100644
--- a/defs/layout.ily
+++ b/defs/layout.ily
@@ -5,4 +5,5 @@
 \layout {
 	indent = 0.0
 	ragged-right = ##f
+	ragged-bottom = ##f
 }
diff --git a/other/drum_salute/config.ily b/other/drum_salute/config.ily
new file mode 100644
index 0000000..e4d3f90
--- /dev/null
+++ b/other/drum_salute/config.ily
@@ -0,0 +1,15 @@
+\version "2.19.0"
+%% Globals
+global = {
+	}
+confTempo = { 
+	}
+%% Format
+part = { \partial 8 \grace{s4.} s8 }
+measure = { \grace {s1} s1 | }
+halfline = { \repeat unfold 4 \measure }
+line = { \repeat unfold 2 { \halfline } }
+
+%% Headers
+title = "Drum Salute"
+meter = "Drum Salute"
diff --git a/other/drum_salute/side.ly b/other/drum_salute/side.ly
new file mode 100644
index 0000000..e08380a
--- /dev/null
+++ b/other/drum_salute/side.ly
@@ -0,0 +1,238 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+cross	= #(define-music-function (parser location notes) (ly:music?)
+				#{
+					\temporary \override Staff.NoteHead.style = #'cross
+					$notes
+					\revert Staff.NoteHead.style
+				#})
+trian = #(define-music-function (parser location notes) (ly:music?)
+				#{
+					\temporary \override Staff.NoteHead.style = #'triangle
+					$notes
+					\revert Staff.NoteHead.style
+				#})
+rim = #(define-music-function (parser location notes) (ly:music?)
+				#{
+					\temporary \override Staff.NoteHead.style = #'xcircle
+					$notes
+					\revert Staff.NoteHead.style
+				#})
+\score {
+    \new PipeBandDrumStaff {
+        \global
+		\drummode {
+			\set countPercentRepeats = ##t
+			\override Staff.TimeSignature.break-visibility = ##(#f #t #t) 
+			\time 4/4
+			\tempo 4 = 116
+			R1 |
+			d1:32(\< |
+			\repeat volta 2 {
+				\repeat percent 3 {
+					d16)->\! g d g-\v
+					d g-\v d g-\v
+					d4->
+					r4
+					|
+				}
+				d16)-> g d g-\v
+				d g-\v d g-\v
+					
+				d16-> g d g-\v
+				d g-\v\< d g-\v
+				|
+				d16-> g d g-\v
+				d g-\v d g-\v
+
+				d8-> \cross { d16 d}
+				\cross d4\!
+			}
+			
+			\break
+
+			\repeat volta 2 {
+				\repeat percent 3 {
+					d8:32( d16) g-\v
+					d8:32( d16) g-\v
+					d8:32( d16) g-\v
+					r16 g-\v d g
+					|
+				}
+				d16-> g d g->
+				d16 g d-> g
+				d16 g-> d g
+				\triplet { d16 g d-\v } g8->
+				|
+			}
+			|
+			\bar ":|."
+			
+			\break
+%%%%%%%%%%%
+			\time 12/8
+			\tempo 4. = 69
+
+			r4. r4. r4. r4. |
+			\repeat percent 3 {
+			  r8 \triplet { d16 g d} \triplet { g16 d g }
+			  d8 \flam g \flam d
+			  r8 \triplet { d16 g d} \triplet { g16 d g }
+			  d8 \flam g \flam d
+			  |
+			  r8 \triplet { d16 g d} \triplet { g16 d g }
+			  d8 \triplet { g16 d g} \triplet { d16 g d }
+			  g8 \triplet { d16 g d} \triplet { g16 d g }
+			  d8 \flam g \flam d
+			}
+
+
+			\break
+
+			\repeat percent 3 {
+				\trian d8 g d
+				\trian g8 d g
+				\trian d16 g d \trian g d g
+				\trian d8 g d
+				|
+				\trian g8 d g
+				\trian d8 g d 
+				\trian g16 d g \trian d g d
+				\trian g4.
+				|
+			}
+
+			\bar "||"
+			\break
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+			\time 4/4
+			\tempo 4 = 116
+			
+			\repeat volta 2 {
+				\flam d8)\! \flam d
+				\flam d d:32(
+				d16.) g32 d16. d32-\v
+				g16. d32-> \triplet {g16 d g }
+				|
+				\flam d8 \flam d
+				\flam d8 g16. g32
+				\triplet { d16-> g d-> } \triplet { g16 d g-\v}
+				\triplet { d16-> g d-> } \triplet { g16 d g-\v}
+				|
+				\flam d8 \flam d
+				\flam d d:32(
+				d16.) g32 d16. d32-\v
+				g16. d32-> \triplet {g16 d g }
+				|
+			} \alternative {
+			  {
+				\flam d8 \pp g
+				g16 g8 g16
+				g8 d:32(\<
+				d4:)(
+			  }
+			  {
+				\flam d8 \pp g
+				g16 g8 g16
+				d4
+				r8 g8:32(
+			  }
+			
+			\break
+
+			\repeat volta 2 {
+				\trian d16} g d \trian g
+				d16 g \trian d g
+				\trian d8 \cross d8
+				\cross d8 d8:32(
+				|
+				\trian d16) g d \trian g
+				d16 g \trian d g
+				\trian d8 \cross d8
+				\cross d8 d8:32(
+				|
+				\trian d16 g d \trian g
+				d16 g \trian d g
+				\trian d16 g d \trian g
+				d16 g \trian d g
+				|
+				\trian d16 g d \trian g
+				d16 g \trian d g
+				\trian d8 \cross { d16  d}
+				\cross d8 d8:32(
+			}
+
+			\break
+			
+			\repeat percent 3 {
+				\trian { d4 d4 d8. g16 r16 g8. } |
+			}
+			\trian { d8. g16
+			r8 d8
+			r16 g16 r8
+			}
+			d16 g d g
+			
+			\bar "||"
+			\break
+
+			\repeat percent 3 {
+				\trian d16 g d g
+				\trian d16 g d g
+				\trian d16 g d \trian g
+				d16 \trian g d g
+			}
+			\trian d16 g d \trian g
+			d16 g \trian d g
+			d16 \trian g d g
+			\trian d8 \flam d8
+
+			\break
+
+			\repeat volta 2 {
+				\repeat percent 3 {
+					\flam d8 \cross d8
+					\cross d8 \flam d8
+					\cross { d16 d d8 }
+					\flam d8 \cross d8
+				}
+				d16-> g d g->
+				d16 g d-> g
+				d16 g-> d g
+				d8 \flam d8
+			}
+
+			\break
+
+			d16->\p\< g d g->
+			d16 g d-> g
+			d16 g-> d g
+			d8 \flam d8
+			|
+			d16-> g d g->
+			d16 g d-> g
+			d16 g-> d g
+			d8 \flam d8\!
+			|
+			g8 \rim { d8
+			d16 d8 d16
+			r16 d8 d16
+			d4 }
+			\bar "|."
+
+
+
+	  }
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentSide
+		composer = "MWO Steele"
+		arranger = "typesetting: Cpl Reesor"
+	}
+}
diff --git a/template/full.ly b/template/full.ly
index 84500fa..2ef1b0d 100644
--- a/template/full.ly
+++ b/template/full.ly
@@ -56,14 +56,14 @@
 			\sideglobal
 
 		}
-		\new PipeBandDrumStaff = "tenor" {
+		\new PipeBandDrumStaff = "tenor" \with {
 			instrumentName = \markup{ \instrumentTenor }
 			shortInstrumentName = \markup{ \shortInstrumentTenor }
 		} {
 			\tenorglobal
 
 		}
-		\new PipeBandDrumStaff = "bass" {
+		\new PipeBandDrumStaff = "bass" \with {
 			instrumentName = \markup{ \instrumentBass }
 			shortInstrumentName = \markup{ \shortInstrumentBass }
 		} {