diff --git a/2-4_marches/black_bear/full.ly b/2-4_marches/black_bear/full.ly
index 529a3ff..f93640d 100644
--- a/2-4_marches/black_bear/full.ly
+++ b/2-4_marches/black_bear/full.ly
@@ -2,7 +2,7 @@
 
 \include "config.ily"
 %\include "notes.bass.ily"
-%\include "notes.tenor.ily"
+\include "notes.tenor.ily"
 \include "notes.side.ily"
 \include "notes.pipes.ily"
 
@@ -36,16 +36,29 @@
 				\snareBA
 				\snareBB
 		}
-%		\new PipeBandDrumStaff = "bass" {
-%			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-%			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
-%
-%		}
-%		\new PipeBandDrumStaff = "tenor" {
-%			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
-%			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
-%
-%		}
+		\new PipeBandDrumStaff = "tenor" {
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+
+			\tenorglobal
+
+			\tenorA s8
+
+			\tenorBA
+			\tenorBB s8
+		}
+		\new PipeBandDrumStaff = "bass" {
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+			s8
+			s2*7
+			s4 s4
+
+			s8
+			s2*8
+			s2*7
+			s4 s4
+		}
 	>>
 	\header {
 		title = \title
diff --git a/2-4_marches/black_bear/notes.pipes.ily b/2-4_marches/black_bear/notes.pipes.ily
index 8b7dc84..8a4e36a 100644
--- a/2-4_marches/black_bear/notes.pipes.ily
+++ b/2-4_marches/black_bear/notes.pipes.ily
@@ -7,7 +7,7 @@ pipesA = {
 	\thrwd d8 [ \dbld d8 ] \grg f16.[  d32  A16.  f32  ]|
 	\thrwd d8 [ \dbld d8 ] \grg f16.[  d32  A16.  f32  ]|
 	\dble e8 [ \grg b8 ] \grip b8 [ \grg e16 d16 ] |
-	\grg c32 [ d16. ] \grg b32 [ \grd c16. ] \grg a16. [ b32 \grg c32 \grd a16. ]
+	\grg c32 [ d16. \grg b32 \grd c16. ] \grg a16. [ b32 \grg c32 \grd a16. ]
 
 	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16.  f32 ] |
 	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16.  f32 ] |
@@ -16,7 +16,7 @@ pipesA = {
 }
 pipesB = {
 	e8 |
-	\grg a16. [ \grd a32 a16 ] \grd b16 ] \thrwd d8 [ \grg d16 e16 ] |
+	\grg a16. [ \grd a32 a16  \grd b16 ] \thrwd d8 [ \grg d16 e16 ] |
 	\dblg g8 [ \grA f16 e16 ] \grg f32 [ A16. f16. d32 ] |
 	\grg a16. [ \grd a32 a16 ] \grd b16 ] \thrwd d8 [ \grg d16 e16 ] |
 	\dblg g8 [ \grA f16 e16 ] \grg f32 [ A16. f16. d32 ] | 
@@ -30,7 +30,7 @@ pipesCA = {
 	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32  A16.  f32 ] |
 	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32  A16.  f32 ] |
 	\dble e8 [ \grg b8 ] \grip b8 [ \grg e16 d16 ] |
-	\grg c32 [ d16. ] \grg b32 [ \grd c16. ] \grg a16. [ b32 \grg c32 \grd a16. ]
+	\grg c32 [ d16.  \grg b32  \grd c16. ] \grg a16. [ b32 \grg c32 \grd a16. ]
 
 	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16.  f32 ] |
 	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16.  f32 ] |
diff --git a/2-4_marches/black_bear/notes.tenor.ily b/2-4_marches/black_bear/notes.tenor.ily
new file mode 100644
index 0000000..b657fc5
--- /dev/null
+++ b/2-4_marches/black_bear/notes.tenor.ily
@@ -0,0 +1,65 @@
+% 2/4 Black Bear
+% Tenor
+\version "2.18.2"
+composerTenor = "F.J. de Boone, v0.5, 2016"
+tenorglobal = {}
+% Music
+tenorApiece = \drummode {
+	r4
+	d16. g32 d16. g32
+	|
+	r4
+	d16. g32 d16. g32
+	|
+	r2
+	|
+	d32 g16. d32 g16. 
+	r4
+	|
+	
+	r4 
+	d16. g32 d16. g32
+	|
+	r4 
+	d16. g32 d16. g32
+	|
+	r4 
+	d16. g32 d16. g32
+	|
+	r4 r8
+}
+tenorA = \drummode {
+	r8 |
+	\tenorApiece
+}
+
+tenorBA = \drummode {
+	d8 |
+	g16. g32 d16. d32
+	r4
+	|
+	r4
+	d32 g16. g32 d16.
+	|
+	d16. g32 d16. d32
+	r4
+	|
+	r4
+	d32 g16. g32 d16.
+	|
+
+	d32 g16. d32 g16.
+	g32 d16. g32 d16.
+	|
+	d32 g16. d32 g16.
+	g32 d16. g32 d16.
+	|
+	d16. g32 d16. d32
+	g16. d32 g16. g32
+	|
+	r4
+	d16. g32 g16. d32
+}
+tenorBB = \drummode {
+	\tenorApiece
+}
diff --git a/2-4_marches/black_bear/tenor.ly b/2-4_marches/black_bear/tenor.ly
new file mode 100644
index 0000000..edf6af8
--- /dev/null
+++ b/2-4_marches/black_bear/tenor.ly
@@ -0,0 +1,37 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.tenor.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+	\global
+	\tenorglobal
+	<<
+			{
+				\repeat volta 2 {
+					\part \line
+				}
+
+				\break
+				\part \line 
+				\bar "||" \break
+				\line \bar "|."
+			
+			}%Format
+			{
+				\tenorA  s8
+
+				\tenorBA
+				\tenorBB
+			
+			}
+	>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentTenor
+		composer = \composerTenor
+	}
+}
diff --git a/2-4_marches/mackenzie_highlanders/full.ly b/2-4_marches/mackenzie_highlanders/full.ly
index abeea5f..bdadcac 100644
--- a/2-4_marches/mackenzie_highlanders/full.ly
+++ b/2-4_marches/mackenzie_highlanders/full.ly
@@ -2,7 +2,7 @@
 
 \include "config.ily"
 \include "notes.bass.ily"
-%\include "notes.tenor.ily"
+\include "notes.tenor.ily"
 \include "notes.side.alt.ily"
 \include "notes.pipes.ily"
 
@@ -27,34 +27,46 @@
 
 				\pipesB
 				\pipesBA
+		
 				\pipesB
 				\pipesBB
 				}%Pipes
 			>>
 		}
 		\new PipeBandDrumStaff = "side" {
+			\sideglobal
 			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
 			\snareA s8
+		
 			\snareBA
+		
 			\snareBB
 
 		}
+		\new PipeBandDrumStaff = "tenor" {
+			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+			
+			r8 \tenorA s8
+
+			\tenorBA
+		
+			\tenorBB s8
+		}
 		\new PipeBandDrumStaff = "bass" {
+			\bassglobal
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
 
 			s8 \bassA
 			
 			s8 \bassBA 
+		
 			\bassBB
 		}
-%		\new PipeBandDrumStaff = "tenor" {
-%			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
-%			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
-%
-%		}
 	>>
 	\header {
 		title = \title
diff --git a/2-4_marches/mackenzie_highlanders/notes.tenor.ily b/2-4_marches/mackenzie_highlanders/notes.tenor.ily
new file mode 100644
index 0000000..61e43d2
--- /dev/null
+++ b/2-4_marches/mackenzie_highlanders/notes.tenor.ily
@@ -0,0 +1,77 @@
+% 2/4 MacKenzie Highlanders
+% Tenor
+\version "2.18.2"
+composerTenor = "F.J. de Boone, v0.5, 2016"
+tenorglobal = {}
+% Music
+
+tenorA = \drummode {
+	r8 d16. g32
+	r8 d16. g32
+	|
+	d4 r8 g8
+	|
+	r8 d16. g32
+	r8 d16. g32
+	|
+	r4 d4
+	|
+	
+	r8 d16. g32
+	r8 d16. g32
+	|
+	d4 r8 g8
+	|
+	r8 d32 g16.
+	r8 d32 g16.
+	|
+	r4 r8
+}
+tenorBA = \drummode {
+	g8 |
+	r8 d32 g16.
+	r8 d32 g16.
+	|
+	d4
+	r8 g8
+	|
+	r8 d32 g16.
+	r8 d32 g16.
+	|
+	r4
+	d8 g8
+	|
+	
+	r8 d32 g16.
+	r8 d32 g16.
+	|
+	d4 r8 g8
+	|
+	r8 d32 g16.
+	r8 d32 g16.
+	|
+	r4 r8
+}
+tenorBB = \drummode {
+	g8 |
+	r8 d32 g16.
+	r8 d32 g16.
+	|
+	d4
+	r8 g8
+	|
+	r8 d32 g16.
+	r8 d32 g16.
+	|
+	r4
+	d8 g8
+	|
+	
+	\repeat unfold 3
+	{
+		r8 d32 g16.
+		r8 d32 g16.
+		|
+	}
+	r4 r8
+}
diff --git a/2-4_marches/mackenzie_highlanders/tenor.ly b/2-4_marches/mackenzie_highlanders/tenor.ly
new file mode 100644
index 0000000..e6f2ba6
--- /dev/null
+++ b/2-4_marches/mackenzie_highlanders/tenor.ly
@@ -0,0 +1,36 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.tenor.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+	\global
+	\tenorglobal
+	<<
+			{
+				\repeat volta 2 {
+					\line
+				}
+
+				\part \line 
+				\bar "||"
+				\break
+
+				\part \line \bar "|."
+			}%Format
+			{
+				\tenorA
+
+				\tenorBA
+				\tenorBB
+			}
+	>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentTenor
+		composer = \composerTenor
+	}
+}
diff --git a/hornpipes/the_walrus/full.ly b/hornpipes/the_walrus/full.ly
index a0e058f..36cdd0d 100644
--- a/hornpipes/the_walrus/full.ly
+++ b/hornpipes/the_walrus/full.ly
@@ -54,6 +54,10 @@
 			\snareBA 
 			\snareBBA s8
 			\snareAB s8
+
+			\snareCA
+			\snareCBA s8
+			\snareBBA s8
 		}
 		\new PipeBandDrumStaff = "bass" {
 			\bassglobal
@@ -74,9 +78,6 @@
 	%		\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 	%	}
 	>>
-	\midi {
-		\tempo 4 = 90
-	}
 	\header {
 		title = \title
 		meter = \meter
diff --git a/hornpipes/the_walrus/notes.side.ily b/hornpipes/the_walrus/notes.side.ily
index e7a7942..a05cd99 100644
--- a/hornpipes/the_walrus/notes.side.ily
+++ b/hornpipes/the_walrus/notes.side.ily
@@ -1,7 +1,7 @@
 % 2/4 The Walrus
 % Side
 \version "2.18.2"
-composerSide = "E.T. de Boone, v0.2, 2016"
+composerSide = "E.T. de Boone, v0.2.9, 2016"
 sideglobal = {
 	\eighthBeaming
 }
@@ -59,3 +59,30 @@ snareBBA = \drummode {
 	d16 d:64( d) g
 	\flam d8
 }
+snareCA = \drummode {
+	d16 g |
+	\flam d16 \< \flam g8 \! g16
+	d8:32( g16) \flam g16
+	|
+	r16 \flam d8 g16
+	d32 g d g d16. g32
+	|
+	\flam d16 g32 g d16 \flam g16
+	d32 g d g       d16 g->
+	|
+	d16:64( g8:32)(-> d16:64)(->
+	g16:64 g16:64)(-> d)-> g16 |
+}
+snareCBA = \drummode {
+	\flam d16 \< \flam g8 \! g16
+	d8:32( g16) \flam g16
+	|
+	r16 \flam d8 g16
+	\triplet { d16 g16 d16 } \flam g16. g32
+	|
+	d16 g32 g d16 \flam g
+	d32 g d g       d16 g16
+	|
+	d16 d:64( d) g
+	\flam d8
+}
diff --git a/hornpipes/the_walrus/side.ly b/hornpipes/the_walrus/side.ly
index c15db1a..3c66f04 100644
--- a/hornpipes/the_walrus/side.ly
+++ b/hornpipes/the_walrus/side.ly
@@ -27,6 +27,10 @@
 				\snareBA 
 				\snareBBA s8
 				\snareAB s8
+
+				\snareCA
+				\snareCBA s8
+				\snareBBA s8
 			}
 		>>
 	}
diff --git a/template/drums.ly b/template/drums.ly
index 4ad9532..dbfe2f0 100644
--- a/template/drums.ly
+++ b/template/drums.ly
@@ -18,18 +18,18 @@
 				{ }%Music
 			>>
 		}
-		\new PipeBandDrumStaff = "bass" {
-			\bassglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
-
-		}
 		\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
diff --git a/template/full.ly b/template/full.ly
index 8728cdf..333ac3c 100644
--- a/template/full.ly
+++ b/template/full.ly
@@ -23,12 +23,6 @@
 			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
-		}
-		\new PipeBandDrumStaff = "bass" {
-			\bassglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
-
 		}
 		\new PipeBandDrumStaff = "tenor" {
 			\tenorglobal
@@ -36,6 +30,12 @@
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 
 		}
+		\new PipeBandDrumStaff = "bass" {
+			\bassglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+
+		}
 	>>
 	\header {
 		title = \title
diff --git a/template/pipes.ly b/template/pipes.ly
index 594c956..1b28246 100644
--- a/template/pipes.ly
+++ b/template/pipes.ly
@@ -20,7 +20,7 @@
 	}
 }
 \score {
-	\new Staff { \global \pipeglobal \pipeKey
+	\new Staff { \global \pipeglobal
 		\set Staff.midiInstrument = #"bagpipe"
 		%%Tune
 	}