From f3d16b9b2e306e76ca63c73bed6581a697db59e1 Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@gmail.com>
Date: Mon, 29 May 2017 17:11:04 +0200
Subject: [PATCH] Changed a lot of dr's and fr's to tutti {}'s + changed some
 unisons + added 2 hornpipe scores

---
 2-4_marches/black_bear/notes.side.ily         |  43 +++--
 2-4_marches/mackenzie_highlanders/drums.ly    |  12 +-
 2-4_marches/mackenzie_highlanders/full.alt.ly |  16 +-
 2-4_marches/mackenzie_highlanders/full.ly     |  16 +-
 2-4_marches/mackenzie_highlanders/mid.alt.ly  |   8 +-
 .../mackenzie_highlanders/notes.side.alt.ily  |   2 +-
 .../mackenzie_highlanders/notes.side.ily      |  60 ++++---
 4-4_marches/flett_from_flotta/notes.side.ily  |  51 ++++--
 4-4_marches/la_baum/notes.side.ily            |  90 ++++++----
 4-4_marches/rowan_tree/notes.side.ily         |  30 ++--
 4-4_marches/rowan_tree/side.ly                |  10 +-
 4-4_marches/scotland_the_brave/high-side.ly   |  30 ++++
 4-4_marches/scotland_the_brave/notes.side.ily |  44 +++--
 .../the_crusaders_march/notes.side.ily        | 100 ++++++-----
 4-4_marches/the_crusaders_march/side.ly       |   1 -
 4-4_marches/wings/side.ly                     |  14 +-
 airs/alexander_mackenzie/notes.side.ily       |  51 ++++--
 airs/alexander_mackenzie/side.ly              |   2 +-
 hornpipes/itchy_fingers/notes.side.ily        |  23 ++-
 hornpipes/mon_the_twerps/config.ily           |  16 ++
 hornpipes/mon_the_twerps/notes.side.ily       | 158 ++++++++++++++++++
 hornpipes/mon_the_twerps/side.ly              |  52 ++++++
 hornpipes/young_pipers/config.ily             |  20 +++
 hornpipes/young_pipers/full.ly                | 156 +++++++++++++++++
 hornpipes/young_pipers/notes.pipes.ily        |  85 ++++++++++
 hornpipes/young_pipers/notes.side.ily         |  87 ++++++++++
 hornpipes/young_pipers/pipes.ly               | 100 +++++++++++
 hornpipes/young_pipers/side.ly                |  77 +++++++++
 standards/24_44_standards.side.ily            |  66 +++++---
 standards/34_standards.setting2.side.ly       |  24 +++
 standards/34_standards.setting3.side.ly       |  25 +++
 standards/34_standards.side.ily               |  12 +-
 standards/34_standards.side.ly                |  43 -----
 standards/68_standards.side.ily               |  78 +++++++--
 standards/68_standards.side.ly                |   2 +-
 standards/68_standards_extra.side.ly          |   7 +-
 standards/98_standards.side.ily               |  36 ++--
 standards/standards.tenor.ily                 |   8 +-
 .../lady_mackenzie_of_fairburn/notes.side.ily |  95 ++++++-----
 .../notes.tenor.ily                           |   6 +-
 strathspeys/molly_connell/notes.side.ily      |  65 ++++---
 41 files changed, 1431 insertions(+), 390 deletions(-)
 create mode 100644 4-4_marches/scotland_the_brave/high-side.ly
 create mode 100644 hornpipes/mon_the_twerps/config.ily
 create mode 100644 hornpipes/mon_the_twerps/notes.side.ily
 create mode 100644 hornpipes/mon_the_twerps/side.ly
 create mode 100644 hornpipes/young_pipers/config.ily
 create mode 100644 hornpipes/young_pipers/full.ly
 create mode 100644 hornpipes/young_pipers/notes.pipes.ily
 create mode 100644 hornpipes/young_pipers/notes.side.ily
 create mode 100644 hornpipes/young_pipers/pipes.ly
 create mode 100644 hornpipes/young_pipers/side.ly
 create mode 100644 standards/34_standards.setting2.side.ly
 create mode 100644 standards/34_standards.setting3.side.ly

diff --git a/2-4_marches/black_bear/notes.side.ily b/2-4_marches/black_bear/notes.side.ily
index 6742647..b9e0d9f 100644
--- a/2-4_marches/black_bear/notes.side.ily
+++ b/2-4_marches/black_bear/notes.side.ily
@@ -6,28 +6,39 @@ sideglobal = { \eighthBeaming }
 %%music
 
 snareA = \drummode {
-	d16.\dr g32 |
-	d8:32(-> g:32)(->	\triplet { d16) g d-> } g16. g32 |
-	d8:32(-> g:32)(->	\triplet { d16) g d-> } g16. g32 |
-	\flam d8 d8:32(		g8)\fr d16. g32 |
-	d16.:64( d32) \triplet { g16 d g }	\flam d16. \flam g32 d16.\dr g32 |
-
-	d8:32(-> g:32)(->	\triplet { d16) g d-> } g16. g32 |
-	d8:32(-> g:32)(->	\triplet { d16) g d-> } g16. g32 |
-	\flam d8 d8:32(		\triplet { g16) d g } \flam d16.\fr g32 |
+	\tutti {
+		d16. g32 |
+		d8:32(-> g:32)(->	\triplet { d16) g d-> } g16. g32 |
+		d8:32(-> g:32)(->	\triplet { d16) g d-> } g16. g32 |
+		\flam d8 d8:32(		g8)
+	} d16. g32 |
+	d16.:64( d32) \triplet { g16 d g }	\flam d16. \flam g32
+	
+	\tutti {
+		d16. g32 |
+		d8:32(-> g:32)(->	\triplet { d16) g d-> } g16. g32 |
+		d8:32(-> g:32)(->	\triplet { d16) g d-> } g16. g32 |
+		\flam d8 d8:32(		\triplet { g16) d g } \flam d16.
+	} g32 |
 	\flam d16. g32-> d32 g d g	d8
 }
 
 snareBA = \drummode {
 	g8 |
-	\flamdr d16. g32 d16. \flam g32		d16. g32-> d32 g d g |
-	d8-> \fr d16. \pp g32	\triplet { d16 d g } d16.-> g32 |
-	\flamdr d16. \mf g32 d16. \flam g32		d16. g32-> d32 g d g |
-	d16.-> \fr g32 d16. \flam g32	d32 g d g d16. g32 |
+	\tutti {
+		\flam d16. g32 d16. \flam g32		d16. g32-> d32 g d g |
+		d8->
+	} d16. \pp g32	\triplet { d16 d g } d16.-> g32 |
+	\tutti {
+		\flam d16. \mf g32 d16. \flam g32		d16. g32-> d32 g d g |
+		d16.->
+	} g32 d16. \flam g32	d32 g d g d16. g32 |
 
 	\flam d16. g32 d16. g32:128(->		g16:64 d8:32)(-> g16:32)(-> |
-	d8.:32)(-> \dr g16:64)(->	g16:64 d8:32)(-> g16) |
+	\tutti {
+		d8.:32)(-> g16:64)(->	g16:64 d8:32)(-> g16) |
 
-	\flam d16. g32 d16. \flam d32		d16. \flam g32 d32 g d g |
-	d8->\fr  \triplet { d16 \< d g } \triplet { d16 g g } d8-> \!
+		\flam d16. g32 d16. \flam d32		d16. \flam g32 d32 g d g |
+		d8->
+	} \triplet { d16 \< d g } \triplet { d16 g g } d8-> \!
 }
diff --git a/2-4_marches/mackenzie_highlanders/drums.ly b/2-4_marches/mackenzie_highlanders/drums.ly
index a5793ea..132b096 100644
--- a/2-4_marches/mackenzie_highlanders/drums.ly
+++ b/2-4_marches/mackenzie_highlanders/drums.ly
@@ -12,8 +12,8 @@
 		\new PipeBandDrumStaff = "side" {
 			\global
 			\sideglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide}
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+			\set Staff.instrumentName = \markup{\instrumentSide}
+			\set Staff.shortInstrumentName = \markup{\shortInstrumentSide}
 
 			<<
 				{
@@ -31,8 +31,8 @@
 		}
 		\new PipeBandDrumStaff = "bass" {
 			\bassglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+			\set Staff.instrumentName = \markup{ \instrumentBass }
+			\set Staff.shortInstrumentName = \markup{ \shortInstrumentBass}
 
 			s8 \bassA
 
@@ -41,8 +41,8 @@
 		}
 		%	\new PipeBandDrumStaff = "tenor" {
 		%		\tenorglobal
-		%		\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
-		%		\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+		%		\set Staff.instrumentName = \markup{ \instrumentTenor }
+		%		\set Staff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 
 		%	}
 	>>
diff --git a/2-4_marches/mackenzie_highlanders/full.alt.ly b/2-4_marches/mackenzie_highlanders/full.alt.ly
index af2c92c..6094f72 100644
--- a/2-4_marches/mackenzie_highlanders/full.alt.ly
+++ b/2-4_marches/mackenzie_highlanders/full.alt.ly
@@ -14,8 +14,8 @@
 		\new Staff {
 			\global
 			\pipeglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
+			\set Staff.instrumentName = \markup{ \instrumentPipes }
+			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
 				{
 				\repeat volta 2 {
@@ -38,8 +38,8 @@
 		}
 		\new PipeBandDrumStaff = "side" {
 			\sideglobal
-			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+			\set Staff.instrumentName = \markup \column {\instrumentSide}
+			\set Staff.shortInstrumentName = \markup{\shortInstrumentSide}
 
 			\snareA s8
 		
@@ -50,8 +50,8 @@
 		}
 		\new PipeBandDrumStaff = "tenor" {
 			\tenorglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+			\set Staff.instrumentName = \markup{ \instrumentTenor }
+			\set Staff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 			
 			\tenorA s8
 
@@ -61,8 +61,8 @@
 		}
 		\new PipeBandDrumStaff = "bass" {
 			\bassglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+			\set Staff.instrumentName = \markup{ \instrumentBass }
+			\set Staff.shortInstrumentName = \markup{ \shortInstrumentBass}
 
 			s8 \bassA
 			
diff --git a/2-4_marches/mackenzie_highlanders/full.ly b/2-4_marches/mackenzie_highlanders/full.ly
index 108f1a8..37bc4c6 100644
--- a/2-4_marches/mackenzie_highlanders/full.ly
+++ b/2-4_marches/mackenzie_highlanders/full.ly
@@ -14,8 +14,8 @@
 		\new Staff {
 			\global
 			\pipeglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
+			\set Staff.instrumentName = \markup{ \instrumentPipes }
+			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
 				{
 				\repeat volta 2 {
@@ -38,8 +38,8 @@
 		}
 		\new PipeBandDrumStaff = "side" {
 			\sideglobal
-			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+			\set Staff.instrumentName = \markup \column {\instrumentSide}
+			\set Staff.shortInstrumentName = \markup{\shortInstrumentSide}
 
 			\snareA s8
 		
@@ -50,8 +50,8 @@
 		}
 		\new PipeBandDrumStaff = "tenor" {
 			\tenorglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+			\set Staff.instrumentName = \markup{ \instrumentTenor }
+			\set Staff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 			
 			\tenorA s8
 
@@ -61,8 +61,8 @@
 		}
 		\new PipeBandDrumStaff = "bass" {
 			\bassglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+			\set Staff.instrumentName = \markup{ \instrumentBass }
+			\set Staff.shortInstrumentName = \markup{ \shortInstrumentBass}
 
 			s8 \bassA
 			
diff --git a/2-4_marches/mackenzie_highlanders/mid.alt.ly b/2-4_marches/mackenzie_highlanders/mid.alt.ly
index f50b2c4..e0eaa2c 100644
--- a/2-4_marches/mackenzie_highlanders/mid.alt.ly
+++ b/2-4_marches/mackenzie_highlanders/mid.alt.ly
@@ -11,8 +11,8 @@
 		\new PipeBandDrumStaff = "bass" {
 			\global
 			\bassglobal
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+			\set Staff.instrumentName = \markup{ \instrumentBass }
+			\set Staff.shortInstrumentName = \markup{ \shortInstrumentBass}
 			<<
 				{
 					\repeat volta 2 { \line } \break
@@ -30,8 +30,8 @@
 		}
 			\new PipeBandDrumStaff = "tenor" {
 				\tenorglobal
-				\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
-				\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+				\set Staff.instrumentName = \markup{ \instrumentTenor }
+				\set Staff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 
 				\tenorA
 
diff --git a/2-4_marches/mackenzie_highlanders/notes.side.alt.ily b/2-4_marches/mackenzie_highlanders/notes.side.alt.ily
index 98615b6..0ad0acb 100644
--- a/2-4_marches/mackenzie_highlanders/notes.side.alt.ily
+++ b/2-4_marches/mackenzie_highlanders/notes.side.alt.ily
@@ -5,7 +5,7 @@ composerSnare = ""
 sideglobal = { \eighthBeaming }
 %%music
 snareA = \drummode {
-	 d8:32( |
+	d8:32( |
 	g8) \tuplet 3/2 { d16 g d } 	\flam g16. d32-> g16. g32 |
 	\flam d8 d8:32(	g8:32)(-> \tuplet 3/2 { d16) g d } |
 
diff --git a/2-4_marches/mackenzie_highlanders/notes.side.ily b/2-4_marches/mackenzie_highlanders/notes.side.ily
index 68dd58d..ce03458 100644
--- a/2-4_marches/mackenzie_highlanders/notes.side.ily
+++ b/2-4_marches/mackenzie_highlanders/notes.side.ily
@@ -1,31 +1,42 @@
 % 2/4 MacKenzie Highlanders
 % Snare
 \version "2.18.2"
-composerSide = "v1.2, 2016"
+composerSide = "v1.3, 2016"
 sideglobal = { \eighthBeaming }
 %%music
 snareA = \drummode {
-	d8:32( \dr |
-	g8)\fr \tuplet 3/2 { d16 g d } 	\flam g16. d32-> g16. g32 |
-	\flam d8 d8:32(	g8:32) d16.\dr g32 |
+	d8:32( |
+	g8) \tuplet 3/2 { d16 g d } 	\flam g16. d32-> g16. g32 |
+	\flam d8 d8:32(	g8) 
+	
+	\tutti { d16. g32 |
+		d8:32( g16.)
+		g32->	d32 g d g-> d8-> |
+		d4:32(\<	d8)\!
+	} d8:32( |
 
-	d8:32( g16.)\fr g32->	d32 g d g-> d8-> |
-	d4:32(\dr\<	d8)\! d8:32( |
+	g8)	 \tuplet 3/2 { d16 g d }	\flam g16. d32-> g16. g32 |
+	d8-> g8:32(->	
+	\tutti {
+		d8:32)(-> \tuplet 3/2 { g16) d g } |
 
-	g8)\fr \tuplet 3/2 { d16 g d }	\flam g16. d32-> g16. g32 |
-	d8-> g8:32(->	d8:32)(\dr-> \tuplet 3/2 { g16) d g } |
-
-	d8[-> \drag d16 d32-> g]	d[ g \drag d16 d16. g32] |
-	d4:32(	d8)\fr
+		d8[-> \drag d16 d32-> g]	d[ g \drag d16 d16. g32] |
+		d4:32(	d8)
+	}
 }
 % Part 2
 snareBA = \drummode {
 	g8 |
 	d8:32( \tuplet 3/2 { g16) d g-> }	d16.-> g32-> d32 g d g-> |
-	d8-> d8:32(	g8) d16.\dr g32 |
+	d8-> d8:32(	g8)
+	
+	\tutti {
+		d16. g32 |
 
-	d8:32( g16.)\fr g32-> d32 g d g-> d8-> |
-	d4:32(\dr\<	d8)\!\fr g8-> |
+		d8:32( g16.)
+		g32-> d32 g d g-> d8-> |
+		d4:32(\<	d8)\!
+	} g8-> |
 
 	d8:32( \tuplet 3/2 { g16) d g-> }	d16.-> g32-> d32 g d g-> |
 	d8-> g8:32(->	d8:32)(\dr-> \tuplet 3/2{ g16) d g } |
@@ -33,17 +44,18 @@ snareBA = \drummode {
 	d8[-> \drag d16 d32-> g]	d[ g \drag d16 d16. g32] |
 	d4:32(	d8)\fr
 }
-snareBB = \drummode {
-	g8 |
-	d8:32( \tuplet 3/2 { g16) d g-> }	d16.-> g32-> d32 g d g-> |
-	d8-> d8:32(	g8) d16. g32 |
+snareBB = \drummode { \tutti {
+		g8 |
+		d8:32( \tuplet 3/2 { g16) d g-> }	d16.-> g32-> d32 g d g-> |
+		d8-> d8:32(	g8) d16. g32 |
 
-	d8:32( g16.) g32-> d32 g d g-> d8-> |
-	\flam d4	d8:32(-> \< g8:32)(-> |
+		d8:32( g16.) g32-> d32 g d g-> d8-> |
+		\flam d4	d8:32(-> \< g8:32)(-> |
 
-	d8)-> \! \tuplet 3/2 { g16 d g-> }	d8:32(-> \tuplet 3/2 { g16) d g-> }
-	d32 g d g-> d16.-> g32	d8:32(-> \tuplet 3/2 { g16) d g } |
+		d8)-> \! \tuplet 3/2 { g16 d g-> }	d8:32(-> \tuplet 3/2 { g16) d g-> }
+		d32 g d g-> d16.-> g32	d8:32(-> \tuplet 3/2 { g16) d g } |
 
-	d8[-> \drag d16 d32-> g]	d[ g \drag d16 d16. g32] |
-	d4:32( d4)
+		d8[-> \drag d16 d32-> g]	d[ g \drag d16 d16. g32] |
+		d4:32( d8)
+	}
 }
diff --git a/4-4_marches/flett_from_flotta/notes.side.ily b/4-4_marches/flett_from_flotta/notes.side.ily
index 8ad36f7..656a513 100644
--- a/4-4_marches/flett_from_flotta/notes.side.ily
+++ b/4-4_marches/flett_from_flotta/notes.side.ily
@@ -1,32 +1,47 @@
 % 4/4 Flett from Flotta
 % Snare
 \version "2.18.2"
-composerSide = "v1.2"
+composerSide = "v1.3"
 sideglobal = {
 	\eighthBeaming
 	}
 %%music
 snareA = \drummode {
-	d8:32( \dr |
-	g8.) \fr g16		d8:32( g8)		d4:32(\dr		d8) d8:32( |
-	g8) \tuplet 3/2 { d16 g d-> }		g16. g32 \flam d8 \fr		\flam g4		d8:32( g8:32)(-> |
-	d4)		d8:32(-> \tuplet 3/2 { g16) d g }		\flamd d16. g32 d16. g32		\flamd d8 g8:32( |
-	d4)->		d4:32(		d4)		d4:32( \dr |
+	d8:32(\> |
+	g8.)\! g16		d8:32( g8)		d4:32(\<		d8)\! 
+	\tutti {
+		d8:32( |
+		g8) \tuplet 3/2 { d16 g d-> }		g16. g32 \flam d8		\flam g4		d8:32(\< g8:32)(-> |
+		d4)\!
+	} d8:32(-> \tuplet 3/2 { g16) d g }		\flamd d16. g32 d16. d32		\flam g8 \tutti {
+		d8:32( |
+		g4)->		d4:32(		d4)
+	}
+	\tutti { d8:32(\< g8:32)(\> |
 
-	d8.) g16		d8:32( g8)		d4:32(		d8) d8:32( |
-	g8) \fr \tuplet 3/2 { d16 g d-> }		g16. g32 \flam d8		\flamg g4		d8:32( g8) |
-	\flamd d8 \dr \tuplet 3/2 { g16 d g }	d8:32(-> g8:32)(->		\tuplet 3/2 { d16) g d } \flamg g8		\flamd d8 g8:32( |
-	d4)->		d4:32(		d4)		r8 \fr
+		d8.)\! g16		d8:32( g8)		d4:32(\<		d8)\! d8:32( |
+		g8) \tuplet 3/2 { d16 g d-> }		g16. g32 \flam d8		\flam g4		d8:32( g8) |
+		\flam d8 \tuplet 3/2 { g16 d g }	d8:32(-> g8:32)(->		\tuplet 3/2 { d16) g d } \flamg g8		\flamd d8 d8:32( |
+		g4)->		d4:32(		d4)
+	}
+	r8
 }
 % Part 2
 snareB = \drummode {
-	d4:32( \dr		d8) d32 g d g		d32 \fr g d g d8		\flamg g8 d8:32( |
-	g8) \dr \tuplet 3/2 { d16 g d-> }		g16. g32 \flam d8		d4:32(		d8:32)(-> g8:32)(->\fr |
-	d4)		r4		r4		r4 |
-	d8.:32(-> g16)		d8:32(-> \dr g8)->		d32 g d g d16 \fr g16->		r16 g16-> r16 g16-> |
+	d4:32(		d8) d32 g d g		d32 g d g d8		\flamg g8 
+	\tutti {
+		d8:32( |
+		g8) \tuplet 3/2 { d16 g d-> }		g16. g32 \flam d8		d4:32(		d8:32)(-> g8:32)(-> |
+		d4)
+	} r4		r4		r4 |
+	\tutti {
+		d8.:32(-> g16)		d8:32(-> g8)->
+	} d32 g d g d16 
+	\tutti { g16->		r16 g16-> r16 g16-> |
 
-	d8.:32(->\dr g16)		d8:32(-> g8)		d4:32(		d8) d8:32( |
-	g8)\fr \tuplet 3/2 { d16 g d-> }		g16. g32 \flam d8		\flamg g4		d8:32( g8) |
-	\flamd d8 \dr \tuplet 3/2 { g16 d g }	d8:32(-> g8:32)(->		\tuplet 3/2 { d16) g d } \flamg g8		\flamd d8 g8:32( |
-	d4)->		d4:32(		d4)		r8 \fr
+		d8.:32(-> g16)		d8:32(-> g8)		d4:32(		d8) d8:32( |
+		g8) \tuplet 3/2 { d16 g d-> }		g16. g32 \flam d8		\flamg g4		d8:32( g8) |
+		\flamd d8 \tuplet 3/2 { g16 d g }	d8:32(-> g8:32)(->		\tuplet 3/2 { d16) g d } \flamg g8		\flamd d8 d8:32( |
+		g4)->		d4:32(		d4)
+	} r8
 }
diff --git a/4-4_marches/la_baum/notes.side.ily b/4-4_marches/la_baum/notes.side.ily
index b0d3bbb..52debb6 100644
--- a/4-4_marches/la_baum/notes.side.ily
+++ b/4-4_marches/la_baum/notes.side.ily
@@ -6,58 +6,76 @@ arrangerSide = ""
 sideglobal = {}
 % Music
 endOne = \drummode {
-  d8:32~\<\dr g:32->~
-  d4->\!
-  d4:32~\<
-  d4:32~\!\fr
+	\tutti {
+		d8:32~\< g:32->~
+		d4->\!
+		d4:32~\<
+		\afterGrace d4:32( {s8)\!}
+	}
 }
 endTwo = \drummode {
-  d4:32\<~
-  d4:32~
-  d4:32~
-  d4:32\!~
+	\tutti {
+		d4:32\<~
+		d4:32~
+		d4:32~
+		d4:32\!~
+	}
 }
 endThree = \drummode {
-  d8:32~\<\dr g:32->~
-  d16. g32 d16. g32
-  d16. g32 d16. g32
-  d16. g32 d g d g
+	\tutti {
+		d8:32~\< g:32->~
+		d16. g32 d16. g32
+		d16. g32 d16. g32
+		d16. g32 d g d g
+	}
 }
 
 snareA = \drummode {
 	\triplet { g16 d g } |
-	\flamdr d8-> d8:32~
-	g8->\fr d16 g
-	\flamdr d16-> g d \flam g-> \fr
+	\tutti {
+		\flam d8-> d8:32~
+		g8-> 
+	} d16 g
+	\tutti {
+		\flam d16-> g d \flam g-> 
+	}
 	d16 g d32 g d g
 	|
-	d8 \flamdr d16-> g
-	d16 \flam g-> \fr d g
-	d32-> \dr \> g d g d16\! g->
-	d16 g \flam d \flam g
-	|
-	\flam d4-> \fr
+	d8 \tutti {
+		d16-> g
+		d16 \flam g->
+	} d16 g
+	\tutti { 
+		d32-> \> g d g d16\! g->
+		d16 g \flam d \flam g
+		|
+		\flam d4->
+	}
 	d4:32~
 	d16-> g d g-> 
 	d32 g d g d8->
 	|
-	d8:32~\p\<\dr g16 d16:32->(
-	g16:32 g) d8:~->
-	g16 d16:32(-> g:32 g)
-	d8:32~-> g16\! d
-	|
+	\tutti {
+		d8:32~\p\< g16 d16:32->(
+		g16:32 g) d8:~->
+		g16 d16:32(-> g:32 g)
+		d8:32~-> g16\! d
+		|
 
-	\flam d4-> \fr
+		\flam d4->
+	}
 	d32 g d g d16 g
-	\flam d8 d:32(\dr\>
-	d4:32
-	|
-	d8.)\!\pp \flam  g16
-	r16 g \flam d8
-	\flam g4
-	d4:32~\<
-	|
-	d8->\!\fr d8:32~
+	\flam d8 \tutti {
+		d:32(\>
+		d4:32
+		|
+		d8.)\!\pp \flam  g16
+		r16 g \flam d8
+		\flam g4
+		d4:32~\<
+		|
+		d8->\!
+	} d8:32~
 	g16-> d g \flam d->
 	g16 d g \flam d->
 	g16 d \flam d8->
diff --git a/4-4_marches/rowan_tree/notes.side.ily b/4-4_marches/rowan_tree/notes.side.ily
index e3aacc9..5129739 100644
--- a/4-4_marches/rowan_tree/notes.side.ily
+++ b/4-4_marches/rowan_tree/notes.side.ily
@@ -6,20 +6,25 @@ sideglobal = { \eighthBeaming }
 
 %%music
 snareEnding = \drummode {
-	\flamdr d8[ d8]:32(	
-	g8[) d8]:32(	
-	\tuplet 3/2 { g16) d g } \flam d16. g32	
-	d16.\fr g32-> d g d g
+	\tutti {
+		\flam d8[ d8]:32(	
+		g8[) d8]:32(	
+		\tuplet 3/2 { g16) d g } \flam d16. g32	
+		d16.} g32-> d g d g
 	|
-	\flamdr d4	d4:32(	d4)\fr
+	\tutti {\flam d4	d4:32(	d4) }
 }
 snareA = \drummode {
-	r8 d8\dr |
-	d4:32(	d8) g8	d4:32(	d8) g8
-	|
-	\flam d16\fr g8 d16->	
+	r8 \tutti {
+		d8 |
+		d4:32(	d8) g8	d4:32(	d8) g8
+		|
+		\flam d16
+	} g8 d16->	
 	g16. g32 \flam d16. g32	
-	\flamdr d16. d32:128( d16.)\fr g32->	
+	\tutti {
+		\flam d16. d32:128( d16.)
+	} g32->	
 	\triplet {d16 g d } \flam g8
 	|
 	\snareEnding
@@ -27,7 +32,10 @@ snareA = \drummode {
 % Part 2
 snareBA = \drummode {
 	d8. g16 |
-	d8[:32(->\dr g8]:32)(->	d8[:32)( g8]:32)(->	d8[:32)( g8]:32)(->	d8[)->\fr d8]:32( |
+	\tutti {
+		d8[:32(->
+		g8]:32)(->	d8[:32)( g8]:32)(->	d8[:32)( g8]:32)(->	d8[)->
+	} d8]:32( |
 	g8.)\pp g16	d8:32( g8)	\flam d8 d8:32(	g8.) g16\f |
 	\snareEnding
 }
diff --git a/4-4_marches/rowan_tree/side.ly b/4-4_marches/rowan_tree/side.ly
index 895adc0..9654034 100644
--- a/4-4_marches/rowan_tree/side.ly
+++ b/4-4_marches/rowan_tree/side.ly
@@ -5,6 +5,12 @@
 \include "./config.ily"
 \include "./notes.side.ily"
 
+markTextEol = #(define-music-function (parser location text) (string?) #{
+	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
+	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
+	\mark \markup $text
+#})
+
 \score {
     \new PipeBandDrumStaff {
         \global
@@ -12,10 +18,10 @@
 		<<
 			\new NullVoice = "format" {
 				\repeat volta 2 {
-					\part \halfline
+					\part \halfline \markTextEol "Fine"
 				}
 				\break
-				\part \halfline \bar "||"
+				\part \halfline \markTextEol "D.C. al Fine"\bar "||"
 			}%Format
 			
 			\new DrumVoice = "side" {
diff --git a/4-4_marches/scotland_the_brave/high-side.ly b/4-4_marches/scotland_the_brave/high-side.ly
new file mode 100644
index 0000000..d897358
--- /dev/null
+++ b/4-4_marches/scotland_the_brave/high-side.ly
@@ -0,0 +1,30 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.side.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+        \global
+	\sideglobal
+        <<
+			{
+				\repeat volta 2 {\part \line \break }
+				\part \line \bar "||"
+			}
+			{
+			 \snareA s8
+
+			 \snareBAhigh
+			}
+		>>
+	}
+	\header {
+		title = #(string-append title " (high)" )
+		meter = \meter
+		instrument = \instrumentSide
+		composer = \composerSide
+	}
+}
diff --git a/4-4_marches/scotland_the_brave/notes.side.ily b/4-4_marches/scotland_the_brave/notes.side.ily
index ec57e80..c02fe89 100644
--- a/4-4_marches/scotland_the_brave/notes.side.ily
+++ b/4-4_marches/scotland_the_brave/notes.side.ily
@@ -7,17 +7,39 @@ sideglobal = {
 	}
 %%music
 snareA = \drummode {
-	d8:32(\dr |
-	g8.)\fr g16	d8:32( g8)	\flam d8[ d8:32(]	g8)[ d8:32(]\dr |
-	\triplet { g16) d g } \flam d16. g32	\triplet { d16 g d } \flam g16. g32	d16. g32 \triplet { d16 g d }	\flam g8\fr d8:32( |
-	g8.) g16	d8:32( g8)	\flam d8 d8:32(	\triplet { g16) d g } d8 |
-	\flamdr d4	d4:32(	d4)\fr	r8
+	\tutti {
+		d8:32( |
+		g8.)
+	} g16	d8:32( g8)	\flam d8[ d8:32(]	g8)[ \tutti { d8:32(] |
+		\triplet { g16) d g } \flam d16. g32	\triplet { d16 g d } \flam g16. g32	d16. g32 \triplet { d16 g d }	\flam g8  d8:32( |
+		g8.)
+	} g16	d8:32( g8)	\flam d8 d8:32(	\triplet { g16) d g } \flam d8 |
+	\tutti {
+		\flam g4	d4:32(	d4)
+	} r8
 }
 % Part 2
-snareBA = \drummode {
-	g8 |
-	d4:32(\dr	d8) g8	d4:32(	d8)\fr d8:32( |
-	\triplet { g16) d g } \flam d16. g32	\triplet { d16 g d } \flam g16. g32	d16. g32 \triplet { d16 g d }	\flam g8 g8 |
-	d4:32(\dr	d8) g8	d4:32(	d8) g8 |
-	\flam d4	d4:32(	d4)\fr	r8
+snareBAA = \drummode {
+	\tutti {
+		g8 |
+		d4:32(	d8) g8	d4:32(	d8)
+	} d8:32( |
+	\triplet { g16) d g } \flam d16. g32	\triplet { d16 g d } \flam g16. g32	d16. g32 \triplet { d16 g d }	\flam g8
+}
+snareBA = \drummode {
+	\snareBAA
+	\tutti {
+		g8 |
+		d4:32(	d8) g8	d4:32(	d8) g8 |
+	\flam d4	d4:32(	d4)
+	} r8
+}
+snareBAhigh = \drummode {
+	\snareBAA
+	\tutti {
+		g8 |
+		d4:32(	d8) g8	d4:32(	d8) g8 |
+		\flam d4	d4:32(	d16.)
+	} g32-> d16. d32
+	\flam g8
 }
diff --git a/4-4_marches/the_crusaders_march/notes.side.ily b/4-4_marches/the_crusaders_march/notes.side.ily
index 25ad7ca..8b5df66 100644
--- a/4-4_marches/the_crusaders_march/notes.side.ily
+++ b/4-4_marches/the_crusaders_march/notes.side.ily
@@ -14,11 +14,13 @@ snareAA = \drummode {
 	r16. d32 g16. g32
 	\flam d8 
 	
-	d8:32( \dr |
-	\tuplet 3/2 { g16) d g } \flamd d16. g32
-	\tuplet 3/2 { d16 g d } \flamg g16. g32
-	d16. g32 \tuplet 3/2 { d16 g d }
-	\flamg g8 \fr
+	\tutti {
+		d8:32( |
+		\tuplet 3/2 { g16) d g } \flamd d16. g32
+		\tuplet 3/2 { d16 g d } \flamg g16. g32
+		d16. g32 \tuplet 3/2 { d16 g d }
+		\flamg g8
+	}
 
 	d16. g32 |
 	\flam d8 d16. g32
@@ -26,28 +28,32 @@ snareAA = \drummode {
 	r16. d32 g16. g32
 	\flam d8 g |
 
-	\flam d4 \dr d4:32( d4)
+	\tutti {
+		\flam d4 d4:32( d4)
+	}
 }
 snareAB = \drummode {
-	d16. g32 |
-	\flam d8 d16. g32
-	\flam d8 d16 g16
-	r16. d32 g16. g32
-	\flam d8 
+	\tutti {
+		d16. g32 |
+		\flam d8 d16. g32
+		\flam d8 d16 g16
+		r16. d32 g16. g32
+		\flam d8 
 	
-	d8:32( |
-	\tuplet 3/2 { g16) d g } \flamd d16. g32
-	\tuplet 3/2 { d16 g d } \flamg g16. g32
-	d16. g32 \tuplet 3/2 { d16 g d }
-	\flamg g8
+		d8:32( |
+		\tuplet 3/2 { g16) d g } \flamd d16. g32
+		\tuplet 3/2 { d16 g d } \flamg g16. g32
+		d16. g32 \tuplet 3/2 { d16 g d }
+		\flamg g8
 
-	d16. g32 |
-	d8:32( \triplet { g16) d g }
-	d8:32( g8:32)(
-	\triplet { d16) g d-> } g16. g32
-	d8:32( \triplet { g16) d g } |
+		d16. g32 |
+		d8:32( \triplet { g16) d g }
+		d8:32( g8:32)(->
+		\triplet { d16) g d-> } g16. g32
+		d8:32( \triplet { g16) d g } |
 	
-	\flam g4 d4:32( d4) \fr
+		\flam g4 d4:32( d4)
+	}
 	\flam d16 d \flam g g
 }
 
@@ -57,11 +63,13 @@ snareBA = \drummode {
 	d8:32( g8)
 	\flam d8
 
-	d8:32( \dr |
-	\tuplet 3/2 { g16) d g } \flamd d16. g32
-	\tuplet 3/2 { d16 g d } \flamg g16. g32
-	d16. g32 \tuplet 3/2 { d16 g d }
-	\flamg g8 \fr
+	\tutti {
+		d8:32( |
+		\tuplet 3/2 { g16) d g } \flamd d16. g32
+		\tuplet 3/2 { d16 g d } \flamg g16. g32
+		d16. g32 \tuplet 3/2 { d16 g d }
+		\flamg g8
+	}
 
 	d16. g32 |
 	\flamd d16. g32 d16. d32
@@ -69,26 +77,30 @@ snareBA = \drummode {
 	d16. \flamg g32 d16. d32
 	\flamg g16. d32 \flam g8 |
 
-	\flam d4 \dr d4:32( d4)
+	\tutti {
+		\flam d4 d4:32( d4)
+	}
 }
 snareBB = \drummode {
-	d16. g32 |
-	\flam d4
-	\flam g8. g16
-	d8:32( g8)
-	\flam d8
+	\tutti {
+		d16. g32 |
+		\flam d4
+		\flam g8. g16
+		d8:32( g8)
+		\flam d8
 
-	d8:32( |
-	\tuplet 3/2 { g16) d g } \flamd d16. g32
-	\tuplet 3/2 { d16 g d } \flamg g16. g32
-	d16. g32 \tuplet 3/2 { d16 g d }
-	\flamg g8
+		d8:32( |
+		\tuplet 3/2 { g16) d g } \flamd d16. g32
+		\tuplet 3/2 { d16 g d } \flamg g16. g32
+		d16. g32 \tuplet 3/2 { d16 g d }
+		\flamg g8
 	
-	d16. g32 |
-	d8:32( \triplet { g16) d g }
-	d8:32( g8:32)(
-	\triplet { d16) g d-> } g16. g32
-	d8:32( \triplet { g16) d g } |
+		d16. g32 |
+		d8:32( \triplet { g16) d g }
+		d8:32( g8:32)(->
+		\triplet { d16) g d-> } g16. g32
+		d8:32( \triplet { g16) d g } |
 	
-	\flam g4 d4:32( d4) \fr
+		\flam g4 d4:32( d4)
+	}
 }
diff --git a/4-4_marches/the_crusaders_march/side.ly b/4-4_marches/the_crusaders_march/side.ly
index cc13623..f9752c3 100644
--- a/4-4_marches/the_crusaders_march/side.ly
+++ b/4-4_marches/the_crusaders_march/side.ly
@@ -14,7 +14,6 @@
 				\part \line  
 				\line \bar "|."
 				\break
-				\bar ".|"
 				\line
 				\line \bar "|."
 			}%Format
diff --git a/4-4_marches/wings/side.ly b/4-4_marches/wings/side.ly
index 6bf14e1..cf9bb63 100644
--- a/4-4_marches/wings/side.ly
+++ b/4-4_marches/wings/side.ly
@@ -5,6 +5,12 @@
 \include "./config.ily"
 \include "./notes.side.ily"
 
+markTextEol = #(define-music-function (parser location text) (string?) #{
+	\once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
+	\once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
+	\mark \markup $text
+#})
+
 \score {
     \new PipeBandDrumStaff {
         \global
@@ -16,12 +22,16 @@
 					\quartline
 				} \alternative {
 				  	\quartline
-					\quartline
+					{	\quartline 
+						\markTextEol "Fine"
+					}
 				}\bar "|."
 				\break
 
 				\partial 8 s8
-				\line \bar "||"
+				\line 
+				\markTextEol "D.C. al Fine"
+				\bar "||"
 			}%Format
 			
 			\new DrumVoice = "side" {
diff --git a/airs/alexander_mackenzie/notes.side.ily b/airs/alexander_mackenzie/notes.side.ily
index 535a2b7..f6149b4 100644
--- a/airs/alexander_mackenzie/notes.side.ily
+++ b/airs/alexander_mackenzie/notes.side.ily
@@ -1,39 +1,60 @@
 % 6/8 Alexander MacKenzie
 % Side
 \version "2.18.2"
-composerSide = "v1.2, E.T. de Boone, 2016"
+composerSide = "v1.3, E.T. de Boone, 2016"
 sideglobal = {
 	\sixteenthCompoundBeaming
 }
 snareAA = \drummode {
 	d16. g32 |
 	d8:32( d8.)-> g16 d4:32( d8) |
-	\dragddr d16. d32-> g16. g32 \flamd d8 d4.:32( \< |
+	\tutti {
+		\dragd d16. d32-> g16. g32 \flamd d8 d4.:32( \< |
 
-	d4) \! \fr d16. g32 d8:32( d8) g8 |
-	\flamddr d16.\< g32 d16. \flamg g32 d16. g32 \flamd d4 \! \fr
+		d4) \!
+	}  d16. g32 d8:32( d8) g8 |
+	\tutti {
+		\flamd d16.\< g32 d16. \flamg g32 d16. g32 \flamd d4 \!
+	}
 }
 snareAB = \drummode {
 	d16. g32 |
 	d8:32( d8.)-> g16 d4:32( d8) |
-	\dragd d16. d32-> g16. g32 \flamd d8 d4:32( \< \dr d16.) \! g32 |
+	\drag d16. d32-> g16. g32 \flamd d8 \tutti {
+		d4:32( \< d16.) \! g32 |
 
-	d8:32( g16.) \fr d32-> g16. g32 d8:32( \dr g16.) \fr d32-> g16. g32 |
-	d4.:32( d4)
+		d8:32(\< g16.)\!
+	}  d32-> g16. g32 \tutti { 
+		d8:32(\< g16.)\!
+	}  d32-> g16. g32 |
+	\tutti {
+		d4.:32( d4)
+	}
 }
 snareBA = \drummode {
 	d8:32( |
-	g4) \flamddr d16. g32 d8:32(\< d8) \flamd d8 \fr \! |
+	g4) \tutti {
+		\flam d16. g32 d8:32(\< d8) \flamd d8\!
+	} |
 	d32-> g d g d g d g-> d g d g		d4-> d8:32(
 
-	g4) \flamddr d16. g32 d8:32( d8) g |
-	d8:32(\< d4:32 \> d4)\! \fr
+	g4) \tutti {
+		\flam d16. g32 d8:32( d8) g |
+		d8:32(\< d4:32 \> d4)\! 
+	}
 }
 snareBB = \drummode {
 	d8:32( |
-	g4) \flamddr d16. g32 d8:32( d8) \flamd d8 |
-	d32-> g d g d g d g-> d g d  g d4.-> |
-
-	d8:32(\< g16.)\! \fr d32-> g16. g32 d8:32(\< \dr g16.)\! \fr d32-> g16. g32 |
-	d4.:32( \dr d4) \fr
+	g4) \tutti {
+		\flam d16. g32 d8:32( d8) \flamd d8 |
+		d32-> g d g d g d g-> d g d  g d4.-> |
+		
+		d8:32(\< g16.)\!
+	}  d32-> g16. g32	\tutti {
+		d8:32(\< { g16.)\!
+	}  d32-> g16. g32 |
+	\tutti {
+		d4.:32( d4)
+	}
+}
 }
diff --git a/airs/alexander_mackenzie/side.ly b/airs/alexander_mackenzie/side.ly
index b915d85..7f1296e 100644
--- a/airs/alexander_mackenzie/side.ly
+++ b/airs/alexander_mackenzie/side.ly
@@ -11,7 +11,7 @@
 		\sideglobal
 	<<
 		{
-			\repeat volta 2 { \part \line \break } \break
+			\repeat volta 2 { \part \halfline \break \halfline } \break
 			\repeat volta 2 { \part \halfline \break }
 				\alternative{ {\part \halfline \break}{\part \halfline \break} }
 			\bar "|."
diff --git a/hornpipes/itchy_fingers/notes.side.ily b/hornpipes/itchy_fingers/notes.side.ily
index 3babef6..c1f022c 100644
--- a/hornpipes/itchy_fingers/notes.side.ily
+++ b/hornpipes/itchy_fingers/notes.side.ily
@@ -6,15 +6,20 @@ snareAA = \drummode {
 	\flamd d16-> g d \flamg g->		d16 g \flamd d-> g |
 	d16 \flamg g-> d g		d8-> d8:32( |
 
-	g16)-> d32 g32 d16 g16->		d32 g32 d32 g32 d16-> d16:64( |
-	d16) g16-> d32 g d g		d4:32( |
+	\tutti { g16)-> } d32 g32 d16 \tutti { g16-> }		d32 g32 d32 g32 d16-> \tutti {
+		d16:64( |
+		d16) g16-> d32 g d g		d4:32(
+		|
+	}
 }
 snareAB = \drummode {
 	\flamd d16)-> g d \flamg g->		d16 g \flamd d-> g |
-	d16 \flamg g-> d g		d8-> \flamd d16-> g16 |
+	d16 \flamg g-> d g		d8-> \tutti {
+		\flamd d16-> g16 |
 
-	d32 g d g d16-> g16		d16 d16:64( d16) g16 |
-	d8:32(-> g8:32)(->		d8)->
+		d32 g d g d16-> g16		d16 d16:64( d16) g16 |
+		d8:32(-> g8:32)(->		d8)->
+	}
 }
 
 snareBA = \drummode {
@@ -22,8 +27,10 @@ snareBA = \drummode {
 	d32-> g d g  d g d g		d16-> g d d |
 	g32-> d g d  g-> d g d		g16-> d g g |
 
-	d32-> g d g  d g d-> g		d g d g d8-> |
-	d16-> d16:64( d16) g16		d4:32(-> |
+	\tutti {
+		d32-> g d g  d g d-> g		d g d g d8-> |
+		d16-> d16:64( d16) g16		d4:32(-> |
+	}
 }
 
 snareBBA = \drummode {
@@ -32,4 +39,4 @@ snareBBA = \drummode {
 
 	d32 g d g d16-> g16		d16 d16:64( d16) g16 |
 	d8:32(-> g8:32)(->		d8)->
-}
\ No newline at end of file
+}
diff --git a/hornpipes/mon_the_twerps/config.ily b/hornpipes/mon_the_twerps/config.ily
new file mode 100644
index 0000000..90f75cc
--- /dev/null
+++ b/hornpipes/mon_the_twerps/config.ily
@@ -0,0 +1,16 @@
+\version "2.19.0"
+%% Globals
+global = {
+	\time 2/4
+	}
+confTempo = { 
+	\tempo 4 = 86 
+	}
+%% Format
+measure = { \grace {s1} s2 | }
+halfline = { \repeat unfold 4 \measure }
+line = { \repeat unfold 2 { \halfline } }
+
+%% Headers
+title = "Mon the Twerps"
+meter = "Hornpipes"
diff --git a/hornpipes/mon_the_twerps/notes.side.ily b/hornpipes/mon_the_twerps/notes.side.ily
new file mode 100644
index 0000000..5337d13
--- /dev/null
+++ b/hornpipes/mon_the_twerps/notes.side.ily
@@ -0,0 +1,158 @@
+% 2/4 Mon the Twerps
+% Side
+\version "2.18.2"
+composerSide = "Carel Ooms, 10-10-2015, Version 1.2"
+arrangerSide = ""
+sideglobal = {
+  \eighthBeaming
+  %\sixteenthBeaming
+}
+% Music
+snareA = \drummode {
+	\tutti {
+		\flam d16-\v g g |
+		d4:32(-\v
+		d16)-> g32 g\< d\! d\< g\! g
+		|
+		d16-\v g32 g d16 \flam g->
+	}
+	d16 \tutti {
+		g
+		\flam d \flam g
+		|
+		\flam d8-\v
+	} g32 d\< d\! g
+	d16 \flam g-> d g 
+	|
+	\tutti { \flam d32-> } g d16 g16 \tutti { \flam d }
+	g16 \tutti {
+		\flam g d32 g d g
+		|
+
+		d8-\v g32 d\< d\! g
+		d16 \flam g->
+	} d \tutti {
+		g
+		|
+		\flam d32 d g16-> d g
+		\flam d16 \flam g->
+	} d32 g d g
+	|
+	\tutti {
+		d16-\v g32 g d16 g->
+	}
+	d16 \tutti { \flam g } d g
+	|
+	\flam d32 d g16-> d \tutti {
+		\flam g
+		\flam d16-\v g g g
+	}
+}
+
+snareBA = \drummode {
+	\tutti {
+		g16 |
+		d8:32(\> g16)\! g
+		d8[ \sruff d16-> g]
+		|
+		d16 \flam g
+	} d32 g g \tutti {
+		d
+		\flam g16 g d \flam d
+		|
+		\flam d16->
+	} g32 g\< d\! d\< g\! g
+	d16 \tutti { \flam g d g
+		|
+		d8:32(->
+	  } \tutti { \grace{s16} g16)-> } \tutti { 
+		g16:64(->% Grace needed to fix unison over accented note
+		g16:64 d)-\v g g
+	}
+	|
+}
+snareBBA = \drummode {
+	\tutti { \grace{s16} d32-> } g d d \tutti { \grace{s32} g32-> } d g g% Grace needed to fix unison over accented note
+	\tutti { d16 \flam g-> } d \tutti {
+		g
+		|
+		\flam d32 d g16-> d g
+		\flam d16 \flam g->
+	} d32 g d g
+	|
+	\tutti {
+		d16-\v g32 g d16 g->
+	}
+	d16 \tutti { \flam g } d \tutti {
+		g
+		|
+		\flam d32 d g16-> d \flam g
+		\flam d8.-\v g16
+	}
+}
+snareBBB = \drummode {
+	\flam d8[ \flam g16-> g]
+	d16[ \flam g-> d32 g d g]
+	|
+	d8.[:32(-\v \> g16)]
+	d16[:64(->\< d16)\! g16:64(->\< g16)\!]
+	|
+	d16[-\v g32 g d16 g->]
+	d16[ \flam g d g]
+	|
+	\flam d32[ d g16-> d \flam g]
+	\flam d8.[-\v g16]
+}
+snareC = \drummode {
+	\tutti {
+		\flam d8-\v \flam g-\v
+		d16[ \flam g->
+	} d32 g d g]
+	|
+	\tutti {
+		d16[-> g32 g d->
+	} g \tutti { \grace{s16} d32-> } g]
+	d32[ d \tutti {
+		g16-> d g]
+		|
+		\flam d16[->
+	} g \drag d \tutti { \grace{s16} d16]-> }
+	g16[ \tutti { \drag d d-> } \triplet { g32 d d] }
+	|
+	\tutti {
+		g16[-> d \flam g d:64(]->
+		g16[:64 g)-\v d32 g d g]
+		|
+	
+		d16-> g \flam d \flam g->
+	}
+	d16 \tutti {
+		\flam g-> d32 g d g
+		|
+		d16->
+	} g32 g d16 \tutti { 
+		\flam g->
+		d32 g d g d16-> g
+		|
+		d16-\v g32 g d16 g->
+	}
+	d16 \tutti { 
+		\flam g d g
+		|
+		\flam d4-> d4:32(\<
+	
+		d8)->\! \flam g->
+		d16 \flam g-> d32 g d g
+		|
+		d16-> g32 g d16 \flam g->
+		\flam d4->
+		|
+		d16 g32 g d->
+	} g \tutti { \grace{s16} d32-> } g
+	d32 d \tutti { 
+		g16-> d g
+		|
+		\drag d16 d d d 
+		d4-\v
+	}
+}
diff --git a/hornpipes/mon_the_twerps/side.ly b/hornpipes/mon_the_twerps/side.ly
new file mode 100644
index 0000000..b7e3875
--- /dev/null
+++ b/hornpipes/mon_the_twerps/side.ly
@@ -0,0 +1,52 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.side.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+        \global
+		<<
+			\new NullVoice = "format" {
+				\repeat volta 2 {
+					\partial 16*3 s16*3 |
+					\line
+				}
+				\break
+				\repeat volta 2 {
+					\partial 16 s16 |
+					\halfline
+				} \alternative {
+					\halfline
+					\halfline
+				}
+				\bar "||"
+				\break
+				\line
+				\bar "||"
+				\halfline
+				\bar "|."	  
+			}%Format
+			
+			\new DrumVoice = "side" {
+		\sideglobal
+				\snareA
+
+				\snareBA
+				\snareBBA
+				\snareBBB
+
+				\snareC
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentSide
+		composer = \composerSide
+		arranger = \arrangerSide
+	}
+}
diff --git a/hornpipes/young_pipers/config.ily b/hornpipes/young_pipers/config.ily
new file mode 100644
index 0000000..d60378d
--- /dev/null
+++ b/hornpipes/young_pipers/config.ily
@@ -0,0 +1,20 @@
+\version "2.19.0"
+%% Globals
+global = {
+	\time 2/4
+	}
+confTempo = { 
+	\tempo 4 = 80 
+	}
+%% Format
+part = { \partial 8 s8 }
+measure = { \grace {s1} s2 | }
+halfline = { \repeat unfold 4 \measure }
+line = { \repeat unfold 2 { \halfline } }
+
+twoOfTwo = \markup { \text \fontsize #2 { 2 of 2 } }
+twoOfFour = \markup { \text \fontsize #2 { 2 of 4 }}
+
+%% Headers
+title = "Young Pipers"
+meter = "Hornpipe"
diff --git a/hornpipes/young_pipers/full.ly b/hornpipes/young_pipers/full.ly
new file mode 100644
index 0000000..547c337
--- /dev/null
+++ b/hornpipes/young_pipers/full.ly
@@ -0,0 +1,156 @@
+\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 Voice = "format"
+			  	{
+					\repeat volta 2 {
+						\part
+						\halfline
+					%	\break
+						
+						\set Score.repeatCommands = #(list (list 'volta twoOfTwo ))
+						\halfline
+						\set Score.repeatCommands = #'((volta #f))
+					}
+					\break
+
+					\repeat volta 2 {
+					 	\part
+						\halfline
+					%	\break
+						\halfline
+					}
+					\break
+
+					\repeat volta 2 {
+					 	\part
+						\halfline
+					%	\break
+						\set Score.repeatCommands = #(list (list 'volta twoOfFour))
+						\halfline
+						\set Score.repeatCommands = #'((volta #f))
+					}
+					\break
+
+					\repeat volta 2 {
+					 	\part
+						\halfline
+					%	\break
+						\halfline
+					}
+				}%Format
+
+				\new Voice = "pipes"
+				{
+					s8 \pipesAA
+					\pipesAB
+	
+					s8 \pipesBA
+					\pipesBBA
+	
+					s8 \pipesCA
+					\pipesCB
+	
+					s8 \pipesDA
+					\pipesDBA
+				}%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}
+
+			\snareAA
+			\snareAB
+			\snareAC
+			\snareAD s8
+
+			\snareBA
+			\snareBB
+			\snareBC
+			\snareAD s8
+
+			\snareCA
+			\snareCB
+			\snareCC
+			\snareAD s8
+
+			\snareDA
+			\snareDB
+			\snareDC
+			\snareAD s8
+		}
+%		\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/hornpipes/young_pipers/notes.pipes.ily b/hornpipes/young_pipers/notes.pipes.ily
new file mode 100644
index 0000000..816c020
--- /dev/null
+++ b/hornpipes/young_pipers/notes.pipes.ily
@@ -0,0 +1,85 @@
+% 2/4 Young Pipers
+% Pipes
+\version "2.18.2"
+composerPipes = "J. Teerlinck-Wiegerinck"
+pipeglobal = {
+	\bagpipeKey
+}
+% LOL: In total 296 notes
+% Music
+pipesEndTwoMeas = {
+  	\grg a16 c \grG c \grg c~	c e \gra e c |
+	\grg a e c \grg d~	d4 |
+}
+
+pipesAAFirstTwoMeas = {
+	\grg a8 d8		\grg a16 d \grc d a |
+	\grg G16 b \grG b \grg b~	b e \grg d b |
+}
+
+pipesAA = {
+	\pipesAAFirstTwoMeas
+	\grg a8 \gre d		\grg a16 c \grG c a~ |
+	a16 d \grc d \grg e		f e \grg d b |
+}
+
+pipesAB = {
+	\pipesAAFirstTwoMeas
+	\pipesEndTwoMeas
+}
+
+pipesBAFirstTwoMeas = {
+	\grg a8 A		\grg a16 f \gre f a |
+	\grg G16 b \grG b \grg b~	b e \grg d b |
+}
+pipesBA = {
+  	\pipesBAFirstTwoMeas
+	\grg a8 \grd c		\grg c16 e \gra e \grg a~ |
+	a16 d \grc d e	\grg f A f d |
+}
+
+pipesBBA = {
+	\pipesBAFirstTwoMeas
+	\pipesEndTwoMeas
+}
+
+pipesBBB = {
+	\pipesAAFirstTwoMeas
+	\pipesEndTwoMeas
+}
+
+pipesCAFirstTwoMeas = {
+	\grg a8 d	\grg f16 e \grg d a |
+	\grg G16 b \grG b a	\grg G e d b |
+}
+pipesCA = {
+	\pipesCAFirstTwoMeas
+	\grg a8 \grd c	\grg c16 e \gra e a |
+	\grg d16 c \grg d e	\grg f A f e |
+}
+
+pipesCB = {
+	\pipesCAFirstTwoMeas
+	\pipesEndTwoMeas
+}
+
+pipesDAFirstTwoMeas = {
+	\grg a8 A	a16 A f d |
+	\grg G16 b \grG b a		\grg G e \grg d b |
+}
+
+pipesDA = {
+	\pipesDAFirstTwoMeas
+	\grg c16 e~ e c		\grg b c~ c b |
+	\grg a16 f~ f A		f A f d |
+}
+
+pipesDBA = {
+	\pipesDAFirstTwoMeas
+	\pipesEndTwoMeas
+}
+
+pipesDBB = {
+	\pipesCAFirstTwoMeas
+	\pipesEndTwoMeas
+}
diff --git a/hornpipes/young_pipers/notes.side.ily b/hornpipes/young_pipers/notes.side.ily
new file mode 100644
index 0000000..5bcda36
--- /dev/null
+++ b/hornpipes/young_pipers/notes.side.ily
@@ -0,0 +1,87 @@
+% 2/4 Young Pipers
+% Side
+\version "2.18.2"
+composerSide = "E.T. de Boone, 2016"
+sideglobal = { \eighthBeaming }
+% Music
+snareAC = \drummode {
+	\flam d8 \flam g8 \fr
+	\flam d16 g d g
+	|
+	\flam d16 g d g:64(\dr
+	g16:64 d) g g
+	|
+}
+snareAA = \drummode {
+	d16 \dr g |
+	\snareAC
+}
+snareAB = \drummode {
+	\flam d8\fr d8:32(
+	g16) \flam d g g
+	|
+	d32 d g16 d \flamdr g
+	d16 g d32 g d g
+	|
+}
+snareAD = \drummode {
+	\flam d16\fr g d \flamdr g \fr
+	d16 g \flamdr d\fr g
+	|
+	d32 g d g d16\dr g
+	\flam d8 \fr
+}
+
+snareBC = \drummode {
+	d8:32(  g:32)(->\fr
+	d32) g d g d16-> g
+	|
+	d16:64( d) g d:64(\dr
+	g16:64 g) d g
+	|
+}
+snareBA = \drummode {
+	d16\dr  g |
+	\snareBC
+}
+snareBB = \drummode {
+  \snareAB
+}
+
+
+snareCC = \drummode {
+	d8:32(\fr  \> g16)\! d:64(\<
+	d16)\! \flam d g g\dr
+	|
+	d32 g d g d16 g:64(
+	g16:64 d) g g
+	|
+}
+snareCA = \drummode {
+  	g8 |
+	\snareCC
+}
+snareCB = \drummode {
+	\snareAB
+}
+
+snareDC = \drummode {
+	\flam d16 \flam g \flam d8
+	g16 d:64( d) g
+	|
+	d32 g d g d16 g:64(
+	g16:64 d) g g
+	|
+}
+snareDA = \drummode {
+	g8 |
+	\snareDC
+}
+snareDB = \drummode {
+	d16 g32 g d16 g
+	d32 g d g d16 g32 g
+	|
+	d16 g8.:32(
+	d16) g d32 g d g 
+	|
+}
diff --git a/hornpipes/young_pipers/pipes.ly b/hornpipes/young_pipers/pipes.ly
new file mode 100644
index 0000000..403ea5f
--- /dev/null
+++ b/hornpipes/young_pipers/pipes.ly
@@ -0,0 +1,100 @@
+\version "2.18.2"
+
+\include "bagpipe.ly"
+
+\include "./config.ily"
+\include "./notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			{
+				\repeat volta 2 {
+					\halfline
+					%\break
+					\halfline
+				}
+				\break
+
+				\repeat volta 2 {
+					\halfline
+					%\break
+				}\alternative{
+					{\halfline}
+					{\halfline}
+				}\bar "|."
+				\break
+
+				\repeat volta 2 {
+					\halfline
+					%\break
+					\halfline
+				}
+				\break
+
+				\repeat volta 2 {
+					\halfline
+					%\break
+				}\alternative{
+					{\halfline}
+					{\halfline}
+				}\bar "|."
+			}%Format
+			{
+				\pipesAA
+				\pipesAB
+
+				\pipesBA
+				\pipesBBA
+				\pipesBBB
+
+				\pipesCA
+				\pipesCB
+
+				\pipesDA
+				\pipesDBA
+				\pipesDBB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\pipesAA
+		\pipesAB
+		\pipesAA
+		\pipesAB
+
+		\pipesBA
+		\pipesBBA
+		\pipesBA
+		\pipesBBB
+
+		\pipesCA
+		\pipesCB
+		\pipesCA
+		\pipesCB
+
+		\pipesDA
+		\pipesDBA
+		\pipesDA
+		\pipesDBB
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/hornpipes/young_pipers/side.ly b/hornpipes/young_pipers/side.ly
new file mode 100644
index 0000000..0715738
--- /dev/null
+++ b/hornpipes/young_pipers/side.ly
@@ -0,0 +1,77 @@
+\version "2.18.2"
+
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.side.ily"
+
+\score {
+    \new PipeBandDrumStaff 
+	{
+        \global
+		<<
+			\new NullVoice = "format" {
+				\repeat volta 2 {
+					\part
+					\halfline
+					%\break
+					\set Score.repeatCommands = #(list (list 'volta twoOfTwo ))
+					\halfline
+					\set Score.repeatCommands = #'((volta #f ))
+				}
+				\break
+				\repeat volta 2 {
+					\part
+					\halfline
+					%\break
+					\halfline
+				}
+				\break
+				\repeat volta 2 {
+					\part
+					\halfline
+					%\break
+					\set Score.repeatCommands = #(list (list 'volta twoOfFour ))
+					\halfline
+					\set Score.repeatCommands = #'((volta #f ))
+				}
+				\break
+				\repeat volta 2 {
+					\part
+					\halfline
+					%\break
+					\halfline
+				}
+			}%Format
+			
+			\new DrumVoice = "side" {
+				\sideglobal
+				\snareAA
+				\snareAB
+				\snareAC
+				\snareAD s8
+
+				\snareBA
+				\snareBB
+				\snareBC
+				\snareAD s8
+
+				\snareCA
+				\snareCB
+				\snareCC
+				\snareAD s8
+
+				\snareDA
+				\snareDB
+				\snareDC
+				\snareAD s8
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentSide
+		composer = \composerSide
+	}
+}
diff --git a/standards/24_44_standards.side.ily b/standards/24_44_standards.side.ily
index 9a124d1..33841a5 100644
--- a/standards/24_44_standards.side.ily
+++ b/standards/24_44_standards.side.ily
@@ -4,47 +4,63 @@
 
 % Midparts
 midone = \drummode {
-	d8:32( \dr |
-	\tuplet 3/2 { g16) d g } \flamd d16. g32		\tuplet 3/2 { d16 g d } \flamg g16. g32
-	d16. g32 \tuplet 3/2 { d16 g d }			\flamg g8 \fr
+	\tutti {
+		d8:32( |
+		\tuplet 3/2 { g16) d g } \flamd d16. g32		\tuplet 3/2 { d16 g d } \flamg g16. g32
+		d16. g32 \tuplet 3/2 { d16 g d }			\flamg g8
+	}
 }
 
 midtwo = \drummode {
-	d8:32( \dr |
-	g16.) d32-> g16. g32		d16. g32-> d16. d32
-	\flamg g8 [ d8:32( ]		g8) \fr
+	\tutti {
+		d8:32( |
+		g16.) d32-> g16. g32		d16. g32-> d16. d32
+		\flamg g8 [ d8:32( ]		g8)
+	}
 }
 midthree = \drummode {
-	d8:32( \dr |			
-	g16.)\! g32 \flam d16. g32	d16. g32-> d32 g d g %|
-	\flam g8 [  d8:32( ]		g8) \fr
+	\tutti {
+		d8:32( |			
+		g16.)\! g32 \flam d16. g32	d16. g32-> d32 g d g %|
+		\flam g8 [  d8:32( ]		g8)
+	}
 }
 midfour = \drummode {
-	d8:32( \dr |
-	\tuplet 3/2 { g16) d g } \flamd d16. g32		\tuplet 3/2 { d16 g d } \flamg g16. g32
-	\drag d16. [  \drag g32  d32 g d g ]	d8 \fr
+	\tutti {
+		d8:32( |
+		\tuplet 3/2 { g16) d g } \flamd d16. g32		\tuplet 3/2 { d16 g d } \flamg g16. g32
+		\drag d16. [  \drag g32  d32 g d g ]	d8
+	}
 }
 % Endings
 endone = \drummode {
-	g8 \dr |
-	\flamd d4 	d4:32(	
-	d4) \fr		r8
+	\tutti {
+		g8 |
+		\flamd d4 	d4:32(	
+		d4)
+	}	r8
 }
 
 endtwo = \drummode {
-	d8:32( \dr |
-	g8) \flamd d16. g32		d16. \flamg g32 d16. g32
-	\flamd d8[ d8:32( ]		g8) \fr
+	\tutti {
+		d8:32( |
+		g8) \flamd d16. g32		d16. \flamg g32 d16. g32
+		\flamd d8[ d8:32( ]		g8)
+	}
 }
 endthree = \drummode {
-	d8:32( \dr |
-	d4)		d4:32(
-	d4) \fr 	r8
+	\tutti {
+		d8:32( |
+		d4)		d4:32(
+		d4) 
+	} 	r8
 }
 endfour = \drummode {
-	d8:32( \dr |
-	\triplet { g16) d g } \flam d16. g32	d32 g d g d16. g32
-	\flam d8[ d8:32( ]		g8) \fr
+	\tutti {
+		d8:32( |
+		\triplet { g16) d g } \flam d16. g32	d32 g d g d16. g32
+		\flam d8[ d8:32( ]		g8)
+	}
 }
 
 % Several Parts
@@ -72,7 +88,7 @@ pthree = \drummode {
 pfour = \drummode {
 	d16. g32 |
 	\flamd d8. g16		\flamd d8 d8:32(
-	d16.) g32-> d16. d32		\flamd d8
+	g16.) d32-> g16. g32		\flamd d8
 }
 pfive = \drummode {
 	d16. g32 |
diff --git a/standards/34_standards.setting2.side.ly b/standards/34_standards.setting2.side.ly
new file mode 100644
index 0000000..4302cb2
--- /dev/null
+++ b/standards/34_standards.setting2.side.ly
@@ -0,0 +1,24 @@
+\version "2.18.2"
+
+\include "./34_standards.side.ily"
+
+\score {
+	\new PipeBandDrumStaff {
+		\eighthBeaming
+		\time 3/4
+		\drummode {
+			\repeat volta 2 { \pseven | \midone | \pseven | \endone } \break
+			\repeat volta 2 { \peight | \midone | \peight | \endone } \break
+			\repeat volta 2 { \pnine | \midone | \pnine | \endone } \break
+			\repeat volta 2 { \pten | \midone | \pten | \endone } \break
+			\repeat volta 2 { \peleven | \midone | \peleven | \endone } \break
+			\repeat volta 2 { \ptwelve | \midone | \ptwelve | \endone } \break
+		}% End of drums %
+	}
+	\header {
+		title = "3/4 Standards\nSetting 2"
+		meter = "Quick March"
+		composer = ""
+		instrument = "Side"
+	}
+}
diff --git a/standards/34_standards.setting3.side.ly b/standards/34_standards.setting3.side.ly
new file mode 100644
index 0000000..8671975
--- /dev/null
+++ b/standards/34_standards.setting3.side.ly
@@ -0,0 +1,25 @@
+\version "2.18.2"
+
+\include "./34_standards.side.ily"
+
+\score {
+	\new PipeBandDrumStaff {
+		\eighthBeaming
+		\time 3/4
+		\drummode {
+			\repeat volta 2 { \pthirteen | \midtwo | \pthirteen | \endtwo } \break
+			\repeat volta 2 { \pfourteen | \midone | \pfourteen | \endone } \break
+			\repeat volta 2 { \pfifteen | \midone | \pfifteen | \endone } \break
+			\repeat volta 2 { \psixteen | \midone | \psixteen | \endone } \break
+			\repeat volta 2 { \pseventeen | \midone | \pseventeen | \endone } \break
+			\repeat volta 2 { \peighteen | \midone | \peighteen | \endone } \break
+		}% End of drums %
+	}
+	\header {
+		title = "3/4 Standards\nSetting 3"
+		meter = "Quick March"
+		composer = ""
+		instrument = "Side"
+	}
+}
+
diff --git a/standards/34_standards.side.ily b/standards/34_standards.side.ily
index df0a26d..3a7be70 100644
--- a/standards/34_standards.side.ily
+++ b/standards/34_standards.side.ily
@@ -4,17 +4,21 @@
 
 % Midparts
 midone = \drummode {
-	\flamd d8 \dr d8:32(	\tuplet 3/2 { g16) d16 g16 } \flamd d16. g32	\tuplet 3/2 { d16 g16 d16 } \flamg g8 \fr |
+	\tutti {
+	  \flamd d8 d8:32(	\tuplet 3/2 { g16) d16 g16 } \flamd d16. g32	\tuplet 3/2 { d16 g16 d16 } \flamg g8
+	} |
 }
 midtwo = \drummode {
-	d8) d8:32( \dr	\tuplet 3/2 { g16) d16 g16 } \flamd d16. g32	\tuplet 3/2 { d16 g16 d16 } \flamg g8 \fr |
+	d8) \tutti {
+	  d8:32( 	\tuplet 3/2 { g16) d16 g16 } \flamd d16. g32	\tuplet 3/2 { d16 g16 d16 } \flamg g8
+	} |
 }
 % Endings
 endone = \drummode {
-	\flamd d4 \dr	d4:32(	d4) \fr
+	\flamd \tutti { d4 	d4:32(	d4)  }
 }
 endtwo = \drummode {
-	d4) d4:32( \dr d4) \fr
+	d4) \tutti { d4:32(  d4)  }
 }
 
 % Several Parts
diff --git a/standards/34_standards.side.ly b/standards/34_standards.side.ly
index b7216cb..e818edf 100644
--- a/standards/34_standards.side.ly
+++ b/standards/34_standards.side.ly
@@ -22,47 +22,4 @@
 		instrument = "Side"
 	}
 }
-\pageBreak
 
-\score {
-	\new PipeBandDrumStaff {
-		\eighthBeaming
-		\time 3/4
-		\drummode {
-			\repeat volta 2 { \pseven | \midone | \pseven | \endone } \break
-			\repeat volta 2 { \peight | \midone | \peight | \endone } \break
-			\repeat volta 2 { \pnine | \midone | \pnine | \endone } \break
-			\repeat volta 2 { \pten | \midone | \pten | \endone } \break
-			\repeat volta 2 { \peleven | \midone | \peleven | \endone } \break
-			\repeat volta 2 { \ptwelve | \midone | \ptwelve | \endone } \break
-		}% End of drums %
-	}
-	\header {
-		title = "3/4 Standards\nSetting 2"
-		meter = "Quick March"
-		composer = ""
-		instrument = "Side"
-	}
-}
-\pageBreak
-
-\score {
-	\new PipeBandDrumStaff {
-		\eighthBeaming
-		\time 3/4
-		\drummode {
-			\repeat volta 2 { \pthirteen | \midtwo | \pthirteen | \endtwo } \break
-			\repeat volta 2 { \pfourteen | \midone | \pfourteen | \endone } \break
-			\repeat volta 2 { \pfifteen | \midone | \pfifteen | \endone } \break
-			\repeat volta 2 { \psixteen | \midone | \psixteen | \endone } \break
-			\repeat volta 2 { \pseventeen | \midone | \pseventeen | \endone } \break
-			\repeat volta 2 { \peighteen | \midone | \peighteen | \endone } \break
-		}% End of drums %
-	}
-	\header {
-		title = "3/4 Standards\nSetting 3"
-		meter = "Quick March"
-		composer = ""
-		instrument = "Side"
-	}
-}
diff --git a/standards/68_standards.side.ily b/standards/68_standards.side.ily
index 509aeca..a257b9a 100644
--- a/standards/68_standards.side.ily
+++ b/standards/68_standards.side.ily
@@ -3,21 +3,37 @@
 \include "lilydrum.ly"
 % Midpart
 midone = \drummode {
-	\flamd d8. \dr g16 d8		d4.:32( |
-	d8.) g16 d8		\flamd d4 \fr
+	\tutti {
+		\flam d8. g16 d8		d4.:32( |
+		d8.) g16 d8		\flamd d4
+	}
+}
+midtwo = \drummode {%Stonehaven PnD
+	\tutti {
+		\flam d8. g16 \flam d8	d16 g d g-> d g |
+		d8. g16 d8	\flam d4
+	}
 }
-
 % Endings
 endone = \drummode {
-	\flamd d8. \dr d16:64( d8)		d4.:32( |
-	d8.) g16 d8 		\flamd d4 \fr
+	\tutti {
+		\flam d8. d16:64( d8)		d4.:32( |
+		d8.) g16 d8 		\flamd d4
+	}
 }
 
 endtwo = \drummode {
-	\flam d8. \dr g16 d8	d16 g d g d8 |
-	d4.:32(		d4) \fr
+	\tutti {
+		\flam d8. g16 d8	d16 g d g d8 |
+		d4.:32(		d4)
+	}
+}
+endthree = \drummode {%Stonehaven PnD
+	\tutti {
+		\flam d8. g16 d32 g d g	d8. g16 \flam d8 |
+		d4.:32(		d4)
+	}
 }
-
 % Parts
 pempty = \drummode {
 	s8 |
@@ -26,12 +42,12 @@ pempty = \drummode {
 pone = \drummode {
 	g8 |
 	\flamd d4 d8:32(	g4) d8:32( |
-	g8.) g16 d8		\flamd d8. g16 d8 |
+	g8.) d16 g8		\flamd d8. g16 d8 |
 }
 ptwo = \drummode {
 	g8 |
-	d8:32( d8) g8		d8:32( d8) g8 |
-	\flamd d8 d8:32( d8)		d8:32( d8) d8|
+	d8.:32( d16) g8		d8.:32( d16) g8 |
+	\flamd d8. d16:64( d8)		d8.:32( d16) g8 |
 }
 
 pthree = \drummode {
@@ -46,16 +62,52 @@ pfour = \drummode {
 	d8. g16 \flamd d8		\flamd d8. g16 d8 |
 }
 
+
 pfive = \drummode {
 	d8:32( |
-	\tuplet 3/2 { g8) d g } \flamd d8		\tuplet 3/2 { g8 d g } \flamd d8 |
+	g16) d g \flam d8.		d16 g d \flam g8. |
+	d16 g d-> g16 d g	\flam d8. g16 d8 |
+
+}
+pfivebis = \drummode {
+	d8:32( |
+	\tuplet 3/2 { g8) d g } \flamd d8		\tuplet 3/2 { d8 g d } \flam g8 |
 	\tuplet 3/2 { d8 g d-> }		\tuplet 3/2 { g8 d g } \flamd \tuplet 3/2 { d8 g8. d16 } |
 
 }
-
 psix = \drummode {
 	g8 |
 	d4.:32(\<		d4.:32)( |
 	d16)\!\< g d g d8\!		\flamd d8. g16 d8 |
 
 }
+
+pseven = \drummode { %Stonehaven PnD
+	g8 |
+	d4:32( g8)	\flam g8. g16 \flam d8 |
+	r8. d16:64( d8)	\flam d8. g16 d8 |
+}
+
+peight = \drummode { %Stonehaven PnD
+	d16 g |
+	\flam d4 g8	d8.:32( g16) \flam d8 |
+	r4 d16 g	\flam d8. g16 d8 |
+}
+
+pnine = \drummode { %Stonehaven PnD
+	d16 g |
+	\flam d4 g8	d8.( g16) \flam d8 |
+	r8. d16:64( d8)	\flam d8. g16 d8 |
+}
+
+pten = \drummode {
+	d8:32( |
+	g8.) g16 \flam d8	\flam g8. g16 \flam d8 |
+	d8. g16 d8	\flam g8. d16 g8|
+}
+
+peleven = \drummode {
+	d8:32( |
+	g8.) g16 \flam d8	\flam g8. g16 d32\< g d g <>\!|
+	d8. g16 d8	\flam g8. d16 g8|
+}
diff --git a/standards/68_standards.side.ly b/standards/68_standards.side.ly
index 897bdba..26b0626 100644
--- a/standards/68_standards.side.ly
+++ b/standards/68_standards.side.ly
@@ -14,7 +14,7 @@
 	    	\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
-	}% End of drums %
+		}% End of drums %
 	}
 
 	\header {
diff --git a/standards/68_standards_extra.side.ly b/standards/68_standards_extra.side.ly
index e0bc774..8d29656 100644
--- a/standards/68_standards_extra.side.ly
+++ b/standards/68_standards_extra.side.ly
@@ -7,8 +7,11 @@
 	\new PipeBandDrumStaff {
 		\time 6/8
 
-		\drummode {
-		}
+        \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 \pten \midone \pempty \endthree}	\break
+		}% End of drums %	
 	}
 	\header{
 		title = "6/8 Marches (Extra)"
diff --git a/standards/98_standards.side.ily b/standards/98_standards.side.ily
index 2b228b4..4f55df6 100644
--- a/standards/98_standards.side.ily
+++ b/standards/98_standards.side.ily
@@ -4,25 +4,29 @@
 composerSide = "E.T. de Boone, 05-01-2017"
 % Midparts
 midone = \drummode {
-	d16\dr g |
-	\flam d8. g16:64~ g8
-	d4.:32~
-	d4 g8
-	|
-	d8. \flam g16 d8
-	d4.:32~ 
-	d4\fr
+	\tutti {
+		d16 g |
+		\flam d8. g16:64( g8)
+		d4.:32(
+		d4) g8
+		|
+		d8. \flam g16 d8
+		d4.:32(
+		d4)
+	}
 }
 % Endings
 endone = \drummode {
-	g8 \dr |
-	\flam d8. d16 g8
-	\flam d4 \drag g8
-	d16\< g d g d8 \!
-	|
-	d8. \flam g16 d8
-	d4.:32~ 
-	d4 \fr
+	\tutti {
+		g8 |
+		\flam d8. d16 g8
+		\flam d4 \drag g8
+		d16\< g d g d8 \!
+		|
+		d8. \flam g16 d8
+		d4.:32(
+		d4)
+	}
 }
 
 % Several Parts
diff --git a/standards/standards.tenor.ily b/standards/standards.tenor.ily
index 3288b35..73a493a 100644
--- a/standards/standards.tenor.ily
+++ b/standards/standards.tenor.ily
@@ -36,7 +36,7 @@ tenorTwofoursOneB = \drummode {
 tenorThreefoursOneA = \drummode {
 	\repeat unfold 2 {
 		d8.-> g16 d8 g r g |
-		d4-> d8^"scoop"\dr g d4^"end" \fr |
+		d4-> \scoop { d8 g d4 } |
 	}
 }
 
@@ -57,7 +57,7 @@ tenorFourfoursOneA = \drummode {
 				d8-> g	d g	 d-- g	d g |
 				d8-> g	d g	 d-- g	d g |
 				d8-> g	d g	 d-- g	d g |
-				d4-> d8^"scoop"\dr g d4^"end"\fr r |
+				d4-> \scoop { d8 g d4 } r |
 }
 
 tenorFourfoursOneB = \drummode {
@@ -76,11 +76,11 @@ tenorSixeightsOneA = \drummode {
 				d4.\up g\up |
 				d^\splitTheFeather r |
 				d g |
-				d8^"scoop"\dr r8 g8 d4.^"end"\fr |
+				\scoop { d8 r8 g8 d4. } |
 				\flourish d4. \flourish g |
 				d^\splitTheFeather r |
 				d g |
-				d8^"scoop"\dr r8 g8 d4.^"end"\fr |
+				\scoop { d8r8 g8 d4. } |
 }
 
 tenorSixeightsOneB = \drummode {
diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily
index 3046b2a..3599314 100644
--- a/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily
+++ b/strathspeys/lady_mackenzie_of_fairburn/notes.side.ily
@@ -5,65 +5,78 @@ composerSide = "E.T. de Boone, v0.9, 2016"
 snareA = \drummode {
 	\flam d8. g16
 	d8.:32( g16)
-	\flamd \triplet { d8 \dr \< g16 g d8 }
-	\flam g8.-> \! \fr \parenthesize g16
+	\tutti {
+		\flamd \triplet { d8 \< g16 g d8 }
+		\flam g8.-> \!
+	} \parenthesize g16
 	|
 	\triplet { d16 g d g d8 }
 	\triplet { g8-> d g-> }
-	d8.:32(-> \dr g16:64)(->
-	d4)
-	|
-	\dragd \triplet { d8 d g }
-	\flam d8. \fr g16 ->
+	\tutti {
+		d8.:32(-> g16:64)(->
+		d4)
+		|
+		\dragd \triplet { d8 d g }
+		\flam d8. 
+	} g16 ->
 	\triplet { d16\< g d g d8 }
 	g16\! d8.
 	|
-	d8.[:32(\< \dr  g16]:32)(-> \>
-	d8.[:32)( g16]:32)(-> \<
-	d8.[:32)( g16]:32)->
-	d8. \! \fr
+	\tutti {
+		d8.[:32(\< g16]:32)(-> \>
+		d8.[:32)( g16]:32)(-> \<
+		d8.[:32)( g16]:32)->
+		d8. \!
+	}
 }
 snareBA = \drummode{
 	g16 |
 	\triplet {d8 g \flam d }
 	\triplet {g d \flam g }
 	\triplet {d8 g \flam d }
-	\flam g8. \dr g16
-	|
-	\flam d16. d32 \flam g8 \fr
+	\tutti {
+		\flam g8. g16
+		|
+		\flam d16. d32 \flam g8
+	}
 	d8.:32( g16:32)(->
 	d16.) g32 d8
-	\flam d8. g16 \dr
-	|
-	\flam d8. \fr g16
+	\flam d8. \tutti { g16
+		|
+		\flam d8.
+	} g16
 	d4:32(
 	\triplet { d16) g d g d8}
 	g8. g16
 	|
-	d8.[:32(\<  \dr g16]:32)(-> \>
-	d8.[:32)( g16]:32)(-> \<
-	d8.[:32)( g16]:32)(->
-	d8.) \! \fr
+	\tutti {
+		d8.[:32(\< g16]:32)(-> \>
+		d8.[:32)( g16]:32)(-> \<
+		d8.[:32)( g16]:32)(->
+		d8.) \!
+	}
 }
 snareBB = \drummode{
-	g16 |
-	\triplet {d8 g \flam d}
-	\triplet {g d \flam g}
-	\triplet {d8 g \flam d}
-	\flam g8. g16
-	|
-	\flam d16. d32 \flam g8
-	d8.:32( g16:32)(->
-	d16.) g32 d8
-	\flam d8. g16
-	|
-	\drag d16 d8 g16
-	d8.:32( g16)
-	\flamd \triplet { d8 \< g16 g d8 }
-	\flam g4-> \!
-	|
-	d8.[:32( g16]:32)(->
-	d8.:32)( g16]:32)(->
-	d8.[:32)( g16]:32)(->
-	d8.)
+	\tutti {
+		g16 |
+		\triplet {d8 g \flam d}
+		\triplet {g d \flam g}
+		\triplet {d8 g \flam d}
+		\flam g8. g16
+		|
+		\flam d16. d32 \flam g8
+		d8.:32( g16:32)(->
+		d16.) g32 d8
+		\flam d8. g16
+		|
+		\drag d16 d8 g16
+		d8.:32( g16)
+		\flamd \triplet { d8 \< g16 g d8 }
+		\flam g4-> \!
+		|
+		d8.[:32( g16]:32)(->
+		d8.:32)( g16]:32)(->
+		d8.[:32)( g16]:32)(->
+		d8.)
+	}
 }
diff --git a/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily b/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily
index 3a0b649..ef01978 100644
--- a/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily
+++ b/strathspeys/lady_mackenzie_of_fairburn/notes.tenor.ily
@@ -39,9 +39,9 @@ tenorBB = \drummode {
 	\triplet { d8 g d }
 	g8. \! \mf g16
 	|
-	d8.^"begin scoop" \dr g16->
-	r8.  g16
-	d8.^"end scoop" \fr g16->
+	\scoop { d8. g16->
+		r8.  g16
+		d8. } g16->
 	r4
 	|
 	d16 g8.
diff --git a/strathspeys/molly_connell/notes.side.ily b/strathspeys/molly_connell/notes.side.ily
index 4f6735b..2aa0fe0 100644
--- a/strathspeys/molly_connell/notes.side.ily
+++ b/strathspeys/molly_connell/notes.side.ily
@@ -1,7 +1,7 @@
 % 4/4 Molly Connell
 % Side
 \version "2.18.2"
-composerSide  = "v1.1, 2015"
+composerSide  = "C. Ooms, v1.2, 2015"
 sideglobal = {}
 intro = \drummode {% by Dean Hall, 2006
 	\flam d4
@@ -12,40 +12,61 @@ intro = \drummode {% by Dean Hall, 2006
 	d16)-> g8.->
 	\triplet { d16 g d g d8-> }
 	g8. g16
-	d4:32(
+	d4:32(\<
 	|
-	d4)-> 
+	d4)-> \!
 	\triplet { d8:32( g8:32 g8) }
-	d8. d16
-	\flam g8. d16:64(
+	\triplet { d8 d g }
+	\triplet { d8 g g }
 	|
-	d16)-> g8.->
-	\tuplet 3/2 { d16 g d g d g }
-	d4:32(
+	\flam d8.-> g16
+	\tuplet 3/2 { d16 g d g d8 }
+	g4:32(
 	d4)
 	|
 }
 snareA = \drummode {
-	\flamddr d4 	\flam g8.[\fr d16:64(]		d8.[) \dragddr d16]		d8.[ \fr g16] |
-	d8.:64[(-> g16])		\triplet  { d16[ g d g d8]}		\triplet  { g8[ d8 \flamddr g8] }		\flam d8.[ \fr g16] |
+	\tutti {
+		\flamd d4 	\flam g8.[
+	} d16:64(]		d8.[) \tutti {
+		\drag d16]		d8.[
+	}
+	
+	g16] |		d8.:64[(-> g16])	\triplet  { d16[ g d g d8]}		\triplet  { g8[ d8 \flamd g8] }		\flam d8.[  g16] |
 
-	d16:64[( d8.])		g8.[ \drag d16]		\triplet  { d16[ g d g d8] }		g8.[ g16] |
-	\flamddr \triplet  { d8 \fr g d }		\flamddr g8.[ \flam g16]		\triplet  { d16 g d g d8 } g8 \fr
+	\tutti {
+		d16:64[( d8.])		g8.[ \drag d16]
+	}	\triplet  { d16[ g d g d8] }		g8.[ g16] |
+	\flamddr \triplet  { d8 \fr g d }		\tutti {
+		\flamd g8.[ \flam g16]		\triplet  { d16 g d g d8 } g8
+	}
 }
 
 snareBA = \drummode {
-	\partial 8 g8 \dr |
-	d4:32(		d8.[) \drag d16] \fr		\triplet { d16[ g d g d8] }		g8.[ g16] \dr |
-	\drag d16[ d8.]		\flam d8.[ \flam g16] \fr		\triplet  { d16[ g d g d8] }		\triplet  { g8[ d g] } |
+	\partial 8 \tutti {
+		g8 |
+		d4:32(		d8.[) \drag d16]
+	} \triplet { d16[ g d g d8] }		g8.[
+	\tutti {
+		g16] |
+		\drag d16[ d8.]		\flam d8.[ \flam g16]
+	} \triplet  { d16[ g d g d8] }		\triplet  { g8[ d g] } |
 
-	\flamddr \triplet  { d8[ \fr g16 g16 d8] }		g8.[ g16]		\flamddr \triplet  { d8[\fr g16 g16 d8] }		g8.[ g16] |
-	\flamddr \triplet  { d8[ \fr g d] }		\flamddr g8.[ \flam g16]		\triplet  { d16[ g d g d8] } g8 \fr
+	\tutti {
+		\flamd \triplet  { d8[ g16 g16 d8] }		g8.[
+		} g16]		\triplet  { d8[ g16 g16 d8] }		g8.[ g16] |
+	\flamddr \triplet  { d8[ \fr  g d] }		\tutti {
+		\flam g8.[ \flam g16]		\triplet  { d16[ g d g d8] } g8
+	}
 }
 snareBB = \drummode {
-	\partial 8 g8 |
-	d4:32(		d8.[) \drag d16]		\triplet  { d16[ g d g d8] }		g8.[ g16] |
-	\drag d16[ d8.]		\flam d8.[ \flam g16]		\triplet  { d16[ g d g d8] }		\triplet  { g8[\> d g]\!  } |
+	\partial 8 
+	\tutti {
+		g8 |
+		d4:32(		d8.[) \drag d16]		\triplet  { d16[ g d g d8] }		g8.[ g16] |
+		\drag d16[ d8.]		\flam d8.[ \flam g16]		\triplet  { d16[ g d g d8] }		\triplet  { g8[\mf\> d g]\p  } |
 
-	\flam d4		\flam g8.[ d16:64](		d8.[) \drag d16]		d8.[ g16] |
-	\flamd \triplet  { d8[ g d] }		\flam g8.[ \flam g16]		\triplet  { d16[ g d g d8] } g8
+		\flam d4\f		\flam g8.[ d16:64](		d8.[) \drag d16]		d8.[ g16] |
+		\flamd \triplet  { d8[ g d] }		\flam g8.[ \flam g16]		\triplet  { d16[ g d g d8] } g8
+	}
 }