diff --git a/3-4_marches/balmoral/notes.pipes.seconds.ily b/3-4_marches/balmoral/notes.pipes.seconds.ily
index 7f0d72e..a954b3f 100644
--- a/3-4_marches/balmoral/notes.pipes.seconds.ily
+++ b/3-4_marches/balmoral/notes.pipes.seconds.ily
@@ -6,24 +6,24 @@ pipessecndglobal = {
 	\bagpipeKey
 	}
 pipessecndA = {
-	\grg c8. [ d16 ] \dble e4 \grg A4 \bar "|"
-	c8. [ d16 ] \dble e2 \bar "|"
-	\dbld d8 [ c8 ] \grg d2 \bar "|"
-	\grg e16. [ d32 \grg c16. d32 ] \dble e2 \bar "|" \break
+	\grg c8. [ d16 ] \dble e4 \grg A4 |
+	c8. [ d16 ] \dble e2 |
+	\dbld d8 [ c8 ] \grg d2 |
+	\grg e16. [ d32 \grg c16. d32 ] \dble e2 |
 
-	\grg c8. [ d16 ] \dble e4 \grg A4 \bar "|"
-	c8. [ d16 ] \dble e2 \bar "|"
-	\dbld d8 [ c8 ] \grg d4 \dblf f4 \bar "|"
-	\grg e8. [ d16 ] \grg c2 
+	\grg c8. [ d16 ] \dble e4 \grg A4 |
+	c8. [ d16 ] \dble e2 |
+	\dbld d8 [ c8 ] \grg d4 \dblf f4 |
+	\grg e8. [ d16 ] \grg c2 |
 }
 pipessecndB = {
-	b8. [ c16 ] \grg d4 \dblf f4 \bar "|"
-	\grg e8 [ d8 ] \grg c2 \bar "|"
-	\dblf f8 [ e8 ] \grg d2 \bar "|"
-	\grg e16. [ d32 \grg c16. d32 ] \dble e2 \bar "|" \break
+	b8. [ c16 ] \grg d4 \dblf f4 |
+	\grg e8 [ d8 ] \grg c2 |
+	\dblf f8 [ e8 ] \grg d2 |
+	\grg e16. [ d32 \grg c16. d32 ] \dble e2 |
 
-	b8. [ c16 ] \grg d4 \dblf f4 \bar "|"
-	\grg e8 [ d8 ] \grg c2 \bar "|"
-	\dblf f8 [ e8 ] \grg d4 \dblf f4 \bar "|"
-	\grg e8. [ d16 ] \grg c2 
+	b8. [ c16 ] \grg d4 \dblf f4 |
+	\grg e8 [ d8 ] \grg c2 |
+	\dblf f8 [ e8 ] \grg d4 \dblf f4 |
+	\grg e8. [ d16 ] \grg c2 |
 }
diff --git a/6-8_marches/kilaloe/full.48th.ly b/6-8_marches/kilaloe/full.48th.ly
new file mode 100644
index 0000000..68f141f
--- /dev/null
+++ b/6-8_marches/kilaloe/full.48th.ly
@@ -0,0 +1,133 @@
+\version "2.19.0"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "./config.ily"
+%\include "./notes.bass.ily"
+\include "./notes.tenor.ily"
+\include "./notes.side.48th.ily"
+\include "./notes.pipes.ily"
+%\include "./notes.pipes.seconds.ily"
+%\include "./notes.lyrics.ily"
+
+part = { \partial 4. \grace {s4} s4. }
+\score {
+	\new StaffGroup <<
+		\new Staff \with {
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
+			\global
+			\pipeglobal
+			<<
+				\new NullVoice = "format" {
+					\part
+					\line
+					\break
+					\line \bar "||"
+					\break
+					\part
+					\line
+					\break
+					\line \bar ".|:-||"
+					\break
+					\repeat volta 2 {
+						\part
+						\line
+						\break
+						\line
+						\measure
+					}
+
+				}%Format
+
+				\new Voice = "pipes" {
+					r4 \pipesA s4.
+
+					\pipesB s4.
+
+					\pipesC s4.
+				}%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
+
+				\snareA \snareA s4.
+
+				\snareB \snareB s4.
+
+				\snareC
+
+		}
+		\new PipeBandDrumStaff = "tenor" \with {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
+			\tenorglobal
+
+			r4. \tenorAA
+			\tenorAB
+
+			r4.	\tenorAA
+			\tenorAB
+
+			r4. \tenorBA
+			\tenorBB
+			| % 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.side.48th.ily b/6-8_marches/kilaloe/notes.side.48th.ily
new file mode 100644
index 0000000..e105897
--- /dev/null
+++ b/6-8_marches/kilaloe/notes.side.48th.ily
@@ -0,0 +1,46 @@
+% 6/8 Kilaloe
+% Side
+\version "2.18.2"
+composerSide = ""
+arrangerSide = "48th HIGHRS, 2018"
+sideglobal = {}
+
+% Music
+snareA = \drummode {
+		d4.:32(\< |
+		d4)\! g8 \flam d4 g8 |
+		d4.:32( d4.:32)(\<|
+		d4) \!g8 \flam d8 g d |
+		g4.:32( d4.:32)(\<|
+		d4)\! g8 \flam d4 g8:32( |
+		d8) g d \flam g8 d g |
+		\flam d4. d4.:32( |
+		d4.)
+}
+snareB = \drummode { \snareA }
+
+snareC = \drummode {
+	\flam d8\< g d |
+	\flam g4\! g8 \flam d4 g8 |
+	d4.:32( d8)\< g d |
+	\flam g4\! g8 \flam d4 g8 |
+	d4.:32( d8)\< g d |
+	\flam g4\! g8-> d8 g d-> |
+	g8 d g-> d g d-> |
+	\flam g4-> g8 d4.:32( |
+	d4.)
+
+	d4.:32( |
+	d4) g8 \flam d4 g8 |
+	d2.:32( |
+	d4.) \flam d8 g d |
+	g2.:32( |
+	d4) g8:32( d4) g8:32( |
+	d8) g d \flam d4. |
+	r4. r4 g8:32( |
+	d8) g d \flam d4 g8 |
+	d4.:32( d4)
+}
+
+
+
diff --git a/6-8_marches/kilaloe/side.48th.ly b/6-8_marches/kilaloe/side.48th.ly
new file mode 100644
index 0000000..62012da
--- /dev/null
+++ b/6-8_marches/kilaloe/side.48th.ly
@@ -0,0 +1,53 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.side.48th.ily"
+
+part = {\partial 4. \grace{ s4 } s4. }
+\score {
+    \new PipeBandDrumStaff {
+        \global
+		\sideglobal
+		<<
+			\new NullVoice = "format" {
+				\repeat volta 2 {
+					\part
+					\line
+				}
+				\break
+				\repeat volta 2 {
+					\part
+					\line
+				}
+				\break
+
+				\repeat volta 2 {
+					\part
+					\line
+					\break
+					\line
+					\measure
+				}
+
+			}%Format
+
+			\new DrumVoice = "side" {
+				\snareA s4.
+
+				\snareB s4.
+
+				\snareC
+
+			}
+		>>
+	}
+	\header {
+		title = \markup \column { \title \normalsize "48th HIGHRS" }
+		meter = \meter
+		instrument = \instrumentSide
+		composer = \composerSide
+		arranger = \arrangerSide
+	}
+}
diff --git a/airs/my_home/notes.tenor.ily b/airs/my_home/notes.tenor.ily
index abda985..23ef21e 100644
--- a/airs/my_home/notes.tenor.ily
+++ b/airs/my_home/notes.tenor.ily
@@ -1,19 +1,16 @@
 % 6/8 My Home
 % Tenor
 \version "2.18.2"
-composerTenor = ""
+composerTenor = "v2.0, 2018"
 tenorglobal = {}
 tenorA = \drummode {
-	d4 d8 g8. d16 g8 |
-	d4. g4 d8 |
-	d4. g4 d8 |
-	d8. g8 d16 d4.|
-
-	d8. g16 d8 g4. |
-	d4 d8 g4. |
-	r8 g8 d8 r8 d8 g8
-	d8 g8 d8 g4.
-}
-tenorB = \drummode {
-
+	d4. g |
+	d4. g8. d16 g8 |
+	d4. g4. |
+	d4. g8 r8 g8 |
+	d4. g4. |
+	d4. g8. d16 g8 |
+	r8 g d r8 d g |
+	d8 g8 d8 g8 r4
 }
+tenorB = \tenorA
diff --git a/airs/the_mist_covered_mountains/notes.tenor.ily b/airs/the_mist_covered_mountains/notes.tenor.ily
index 8e76ab0..ece623b 100644
--- a/airs/the_mist_covered_mountains/notes.tenor.ily
+++ b/airs/the_mist_covered_mountains/notes.tenor.ily
@@ -1,25 +1,16 @@
 % 6/8 The Mist Covered Mountains
 % Tenor
 \version "2.18.2"
-composerTenor = "v1.0, 2016"
+composerTenor = "v2.0, 2018"
 tenorglobal = {}
 tenorA = \drummode {
 	d4. g |
-	d4. g8 r8 g8 |
 	d4. g8. d16 g8 |
-	d8. g16 d8 g8 r8 g8 |
-	d4. g |
+	d4. g4. |
 	d4. g8 r8 g8 |
-	d4. g8 d8 g8 |
-	d8 g8 d8 g8 r4
-}
-tenorB = \drummode {
-	d4. g |
-	d4. g8 r8 g8 |
-	d4. g |
-	d4. g8 r8 g8 |
-	d4. g |
-	d4. g8 r8 g8 |
-	r8 g8 d8 r8 d8 g8 |
+	d4. g4. |
+	d4. g8. d16 g8 |
+	r8 g d r8 d g |
 	d8 g8 d8 g8 r4
 }
+tenorB = \tenorA
diff --git a/standards/68_standards.side.ily b/standards/68_standards.side.ily
index 2eaa884..8c6d08d 100644
--- a/standards/68_standards.side.ily
+++ b/standards/68_standards.side.ily
@@ -69,7 +69,7 @@ pfour = \drummode {
 pfive = \drummode {
 	d8:32( |
 	\tuplet 3/2 { g8) d g } \flamd d8		\tuplet 3/2 { d8 g d } \flam g8 |
-	d16 g d-> g d g	\flam d8 g8. d16 |
+	d16 g d-> g d g	\flam d8. g16 d8 |
 
 }
 
diff --git a/standards/68_standards.side.ly b/standards/68_standards.side.ly
index 26b0626..f8e46d3 100644
--- a/standards/68_standards.side.ly
+++ b/standards/68_standards.side.ly
@@ -11,9 +11,12 @@
 	       	\repeat volta 2 { \partial 8 \pone \midone \pone \endone}	\break
 	       	\repeat volta 2 { \partial 8 \ptwo \midone \ptwo \endone}	\break
 	       	\repeat volta 2 { \partial 8 \pthree \midone \pthree \endone}	\break
-	    	\repeat volta 2 { \partial 8 \pfour \midone \pfour \endone}	\break
-	    	\repeat volta 2 { \partial 8 \pfive \midone \pfive \endone}	\break
-	    	\repeat volta 2 { \partial 8 \psix \midone \psix \endone}	\break
+		    \repeat volta 2 { \partial 8 \pfour \midone \pfour \endone}	\break
+		    \repeat volta 2 { \partial 8 \pfive \midone \pfive \endone}	\break
+		    \repeat volta 2 { \partial 8 \psix \midone \psix \endone}	\break
+
+		    \repeat volta 2 { \partial 8 \ptwelve \midone \ptwelve \endone}	\break
+		    \repeat volta 2 { \partial 8 \pthirteen \midone \pthirteen \endone}	\break
 		}% End of drums %
 	}
 
diff --git a/standards/68_standards_extra.side.ly b/standards/68_standards_extra.side.ly
index 812c786..7d14cff 100644
--- a/standards/68_standards_extra.side.ly
+++ b/standards/68_standards_extra.side.ly
@@ -10,9 +10,8 @@
         \drummode {
 	       	\repeat volta 2 { \partial 8 \pseven \midone \peight \endone}	\break
 	       	\repeat volta 2 { \partial 8 \pnine \midtwo \pten \endtwo}	\break
-	    	\repeat volta 2 { \partial 8 \peleven \midone \ptwelve \endthree}	\break
-	    	\repeat volta 2 { \partial 8 \pthirteen \midone \pempty \endthree}	\break
-		}% End of drums %	
+	    		\repeat volta 2 { \partial 8 \peleven \midone \pempty \endthree}	\break
+		}% End of drums %
 	}
 	\header{
 		title = "6/8 Marches (Extra)"
diff --git a/strathspeys/keel_row/bass.ly b/strathspeys/keel_row/bass.ly
new file mode 100644
index 0000000..ea3f2ba
--- /dev/null
+++ b/strathspeys/keel_row/bass.ly
@@ -0,0 +1,37 @@
+\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 {
+				  	\halfline
+				}
+				\break
+				\repeat volta 2 {
+					\halfline
+				}
+			}%Format
+			\new DrumVoice {
+				\bassA
+
+				\bassB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentBass
+		composer = \composerBass
+		arranger = \arrangerBass
+	}
+}
diff --git a/strathspeys/keel_row/drums.ly b/strathspeys/keel_row/drums.ly
new file mode 100644
index 0000000..8e7c410
--- /dev/null
+++ b/strathspeys/keel_row/drums.ly
@@ -0,0 +1,72 @@
+\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" \with {
+			instrumentName = \markup{ \instrumentSide }
+			shortInstrumentName = \markup{ \shortInstrumentSide }
+		} {
+			\global
+			\sideglobal
+			<<
+				\new NullVoice = "format" {
+					\repeat volta 2 {
+				  		\halfline
+					}
+					\break
+					\repeat volta 2 {
+						\halfline
+					}
+				}%End of Format
+				\new DrumVoice = "side" {
+					\snareA
+
+					\snareB
+				}%End of side
+			>>
+		}
+		\new PipeBandDrumStaff = "tenor" \with {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
+			\tenorglobal
+
+			\tenorA
+
+			\tenorB
+		}
+		\new PipeBandDrumStaff = "bass" \with {
+			instrumentName = \markup{ \instrumentBass }
+			shortInstrumentName = \markup{ \shortInstrumentBass}
+		} {
+			\bassglobal
+
+			\bassA
+
+			\bassB
+		}
+	>>
+	\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/strathspeys/keel_row/full.ly b/strathspeys/keel_row/full.ly
new file mode 100644
index 0000000..cb36549
--- /dev/null
+++ b/strathspeys/keel_row/full.ly
@@ -0,0 +1,113 @@
+\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" {
+					\repeat volta 2 {
+				  		\halfline
+					}
+					\break
+					\repeat volta 2 {
+						\halfline
+					}
+				}%Format
+
+				\new Voice = "pipes" {
+					\pipesA
+
+					\pipesB
+				}%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
+
+			\snareA
+
+			\snareB
+		}
+		\new PipeBandDrumStaff = "tenor" \with {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
+			\tenorglobal
+
+			\tenorA
+
+			\tenorB
+		}
+		\new PipeBandDrumStaff = "bass" \with {
+			instrumentName = \markup{ \instrumentBass }
+			shortInstrumentName = \markup{ \shortInstrumentBass }
+		} {
+			\bassglobal
+
+			\bassA
+
+			\bassB
+		}
+	>>
+	\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/strathspeys/keel_row/mid.ly b/strathspeys/keel_row/mid.ly
new file mode 100644
index 0000000..f0439bf
--- /dev/null
+++ b/strathspeys/keel_row/mid.ly
@@ -0,0 +1,59 @@
+\version "2.19.0"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.bass.ily"
+\include "./notes.tenor.ily"
+
+\score {
+	\new StaffGroup <<
+		\new PipeBandDrumStaff = "tenor" \with {
+			instrumentName = \markup{ \instrumentTenor }
+			shortInstrumentName = \markup{ \shortInstrumentTenor }
+		} {
+			\tenorglobal
+			\global
+			<<
+				\new NullVoice = "format"{
+					\repeat volta 2 {
+				  		\halfline
+					}
+					\break
+					\repeat volta 2 {
+						\halfline
+					}
+				}%Format
+				{
+					\tenorA
+
+					\tenorB
+				}%Music
+			>>
+		}
+		\new PipeBandDrumStaff = "bass" \with {
+			instrumentName = \markup{ \instrumentBass }
+			shortInstrumentName = \markup{ \shortInstrumentBass }
+		} {
+			\bassglobal
+
+			\bassA
+
+			\bassB
+		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup {
+			\column \right-align {
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}
diff --git a/strathspeys/keel_row/notes.bass.ily b/strathspeys/keel_row/notes.bass.ily
new file mode 100644
index 0000000..75e2517
--- /dev/null
+++ b/strathspeys/keel_row/notes.bass.ily
@@ -0,0 +1,20 @@
+% 4/4 Keel Row
+% Bass
+\version "2.18.2"
+composerBass  = ""
+arrangerBass  = ""
+bassglobal = {}
+% Music
+bassA = \drummode {
+	d4 r4 d4 r4 |
+	d4 r4 d4 g4 |
+	d4 r4 d4 r4 |
+	d4 g4 d4 d4 |
+}
+
+bassB = \drummode {
+	d4 g4 d4 r4 |
+	d4 r4 d4 g4 |
+	d4 g4 d4 r4 |
+	d4 g4 d4 d4 |
+}
diff --git a/strathspeys/keel_row/notes.side.ily b/strathspeys/keel_row/notes.side.ily
new file mode 100644
index 0000000..e1d2995
--- /dev/null
+++ b/strathspeys/keel_row/notes.side.ily
@@ -0,0 +1,32 @@
+% 4/4 Keel Row
+% Side
+\version "2.18.2"
+composerSide = "E.T. de Boone, 2018" %26-09-2018
+arrangerSide = ""
+sideglobal = {
+	\sixteenthBeaming
+}
+% Music
+snareA = \drummode {
+	\flamdr d4 \fr  d8. g16  d4:32->(  g8.)
+	\tutti {
+		d16-\v |
+		\flam g4  d8. g16  \triplet { d8 g d }  \flam d8.
+	}  d16:64( \< |
+	d8.[)\! \dragdr d16] \fr  r8. g16  \triplet { d16 g d g d8 }  \triplet { g8 d g }
+	\tutti {
+		\flamd \triplet { d8 g d-> }  g8. g16  d4:32( d4)
+	}
+}
+
+snareB = \drummode {
+	d16 \flam g8.  g8. d16  g4:32->( g8.)
+	\tutti {
+		d16-\v |
+		\flam g4  d8. g16  \triplet { d8 g d }  \flam d8.
+	}  g16 |
+	\drag d16 d8.  d16[ \drag g8.]  d4:32->(  d8.) g16
+	\tutti {
+		\flamd \triplet { d8 g d-> }  g8. g16  d4:32( d4)
+	}
+}
\ No newline at end of file
diff --git a/strathspeys/keel_row/notes.tenor.ily b/strathspeys/keel_row/notes.tenor.ily
new file mode 100644
index 0000000..89d431f
--- /dev/null
+++ b/strathspeys/keel_row/notes.tenor.ily
@@ -0,0 +1,20 @@
+% 4/4 Keel Row
+% Tenor
+\version "2.18.2"
+composerTenor = ""
+arrangerTenor = ""
+tenorglobal = {}
+% Music
+tenorA = \drummode {
+	d4 g4 d4 r4 |
+	d8.-> g16  d8. d16  g8.-> d16 g4 |
+	d4 g4 d4 r4 |
+	d4 g4 d8. g16 d4 |
+}
+
+tenorB = \drummode {
+	r4 r4 d4 g4  |
+	d8.-> g16  d8. d16  g8.-> d16 g4 |
+	r4 r4 d4 g4 |
+	d4 g4 d8. g16 d4 |
+}
diff --git a/strathspeys/keel_row/side.ly b/strathspeys/keel_row/side.ly
new file mode 100644
index 0000000..77a8b51
--- /dev/null
+++ b/strathspeys/keel_row/side.ly
@@ -0,0 +1,37 @@
+\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 {
+				  	\halfline
+				}
+				\break
+				\repeat volta 2 {
+					\halfline
+				}
+			}%Format
+
+			\new DrumVoice = "side" {
+				\snareA
+
+				\snareB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentSide
+		composer = \composerSide
+		arranger = \arrangerSide
+	}
+}
diff --git a/strathspeys/keel_row/tenor.ly b/strathspeys/keel_row/tenor.ly
new file mode 100644
index 0000000..c2f3f43
--- /dev/null
+++ b/strathspeys/keel_row/tenor.ly
@@ -0,0 +1,37 @@
+\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 {
+				  	\halfline
+				}
+				\break
+				\repeat volta 2 {
+					\halfline
+				}
+			}%Format
+
+			\new DrumVoice = "tenor" {
+				\tenorA
+
+				\tenorB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentTenor
+		composer = \composerTenor
+		arranger = \arrangerTenor
+	}
+}
diff --git a/template/bass.ly b/template/bass.ly
index 190bdf6..70405c3 100644
--- a/template/bass.ly
+++ b/template/bass.ly
@@ -12,10 +12,10 @@
 		<<
 			\new NullVoice = "format"
 			{
-				
+
 			}%Format
-			\new DrumVoice { 
-				
+			\new DrumVoice {
+
 			}
 		>>
 	}
diff --git a/template/full.ly b/template/full.ly
index 2ef1b0d..33d644a 100644
--- a/template/full.ly
+++ b/template/full.ly
@@ -21,34 +21,36 @@
 			\pipeglobal
 			<<
 				\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" \with {
-%			instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
-%			shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd }
-%		} {
-%			\pipessecndglobal
-%
-%
-%		}
+%{		\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 }
diff --git a/template/lyrics.ly b/template/lyrics.ly
index 3cdd0ab..dd4cdc9 100644
--- a/template/lyrics.ly
+++ b/template/lyrics.ly
@@ -11,17 +11,17 @@
 		\global
 		\lyricsglobal
 		<<
-%		  	\new NullVoice = "format"{
-%				
-%			}%Format
+%{		  	\new NullVoice = "format"{
 
+			}%Format
+%}
 			\new Voice = "tune" {
-				
+
 			}
 
 			\new Lyrics = "lyrics" {
-				\lyricsto "tune" { 
-					
+				\lyricsto "tune" {
+
 				}
 			}
 		>>
@@ -43,12 +43,13 @@
 
 	}
 }
-%\markup {
-%  \fill-line{
-%	\column {
-%	  \verseAblock
-%	  \combine \null \vspace #0.5
-%	  \verseBblock
-%	}
-%  }
+%{\markup {
+  \fill-line{
+	\column {
+	  \verseAblock
+	  \combine \null \vspace #0.5
+	  \verseBblock
+	}
+  }
+}
 %}
diff --git a/template/pipes.full.ly b/template/pipes.full.ly
index 307a02d..53d95c7 100644
--- a/template/pipes.full.ly
+++ b/template/pipes.full.ly
@@ -17,10 +17,10 @@
 			\pipeglobal
 			<<
 			  	\new NullVoice = "format" {
-					
+
 				}%Format
 				\new Voice = "pipes" {
-					
+
 				}%Pipes
 			>>
 		}
@@ -29,15 +29,16 @@
 			shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd}
 		} {
 			\pipessecndglobal
-			
+
 		}
-%		\new Staff = "thirds" \with {
-%			instrumentName = \markup{ \instrumentPipes \instrumentThrd }
-%			shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentThrd}
-%		} {
-%			\pipesthrdglobal
-%
-%		}
+%{		\new Staff = "thirds" \with {
+			instrumentName = \markup{ \instrumentPipes \instrumentThrd }
+			shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentThrd}
+		} {
+			\pipesthrdglobal
+
+		}
+%}
 	>>
 	\header {
 		title = \title
@@ -63,7 +64,7 @@
 			\pipeglobal
 			\set Staff.midiInstrument = #"bagpipe"
 			%%Tune
-		
+
 		}
 		\new Staff = "seconds" {
 			\pipessecndglobal
@@ -75,7 +76,7 @@
 %			\pipesthrdglobal
 %			\set Staff.midiInstrument = #"bagpipe"
 %			%% Thirds
-%		
+%
 %		}
 	>>
 	\midi { \confTempo }