diff --git a/build b/build
index 7411d29..25d127e 100644
--- a/build
+++ b/build
@@ -1,8 +1,10 @@
 #!/bin/bash
 
 MKDRUMCOMMAND="./lily_files/makedrum"
-MKDRUMOPTIONS="-i ./lily_files/defs.ly -x ./lily_files/lilydrum.ly -c ./lily_files/bagpipe_new.ly"
-MUSIC_DIR="./music"
+MKDRUMOPTIONS="--no-log -i ./lily_files/defs.ly -i ./lily_files/header_default.ily --drumfile ./lily_files/lilydrum/lilydrum.ly --pipefile ./lily_files/bagpipe_new.ly -s 18"
+MUSIC_DIR="./music/"
+OUT_DIR="./pdf/"
+MKDRUMOPTIONS="$MKDRUMOPTIONS -d $OUT_DIR"
 
 trap "echo Aborted!; exit;" SIGINT SIGTERM
 
@@ -30,7 +32,7 @@ another_dir() {
 	done;
 }
 
-if [ "$1" == "-a" ]; then
+if [ "$1" == "--all" ]; then
 	echo "Build all"
 	another_dir $MUSIC_DIR
 elif [ -f "$1" ]; then
@@ -40,3 +42,8 @@ elif [ -d "$1" ]; then
 	echo "Build files in directory"
 	another_dir "$1"
 fi
+
+for f in $OUT_DIR/music-*
+do
+	mv $f ${f/music-/}
+done;
diff --git a/header_book.ily b/header_book.ily
deleted file mode 100644
index 6e0e8e1..0000000
--- a/header_book.ily
+++ /dev/null
@@ -1,42 +0,0 @@
-%{
-    Header formatting for tunes. Customize to get your name in the tag line.
-%}
-
-\version "2.16.0"
-
-today = #(strftime "%B %e, %Y" (localtime (current-time)))
-
-\paper {
-    raggedbottom = ##t
-    tagline = \markup {
-        \line {
-            "Cpl ET de Boone, Seaforths of Holland,"
-            \concat { "(rev. " \today ")" }
-        }
-    }
-    bookTitleMarkup = \markup {
-      \override #'(baseline-skip . 3.5)
-      \column {
-        \fill-line { \fromproperty #'header:dedication }
-        \override #'(baseline-skip . 3.5)
-        \column {
-          \huge \larger \bold
-          \fill-line {
-            \larger \fromproperty #'header:title
-          }
-          \fill-line {
-            \large \smaller \bold
-            \larger \fromproperty #'header:subtitle
-          }
-          \fill-line {
-            \smaller \bold
-            \fromproperty #'header:source
-          }
-          \fill-line {
-          \line { \fromproperty #'header:meter }
-          \line { \fromproperty #'header:composer " " \italic \fromproperty #'header:arranger }
-          }
-        }
-      }
-    }
-}
diff --git a/header_default.ily b/header_default.ily
deleted file mode 100644
index e14d07b..0000000
--- a/header_default.ily
+++ /dev/null
@@ -1,39 +0,0 @@
-%{
-    Header formatting for tunes. Customize to get your name in the tag line.
-%}
-
-\version "2.16.0"
-
-today = #(strftime "%B %e, %Y" (localtime (current-time)))
-
-\paper {
-    tagline = \markup {
-        \line {
-			"Cpl ET de Boone, Seaforths of Holland,"
-            \concat { "(rev. " \today ")" }
-        }
-    }
-    scoreTitleMarkup = \markup {
-        \override #'(baseline-skip . 3)
-        \column {
-            \fill-line {
-                \column {
-                    \large \bold \fromproperty #'header:title
-                    \bold \fromproperty #'header:subtitle
-                }
-                \fromproperty #'header:meter
-                \column \right-align {
-					\fromproperty #'header:instrument
-					\line {
-						\fromproperty #'header:composer
-						$(if (and (ly:get-option 'header:composer) (ly:get-option 'header:arranger))
-							(markup " "))
-						\italic \fromproperty #'header:arranger }
-				}
-            }
-            $(if (not (ly:get-option 'without-comment))
-                 (markup #:justify-field 'header:comment)
-                 (markup))
-        }
-    }
-}
diff --git a/lilydrum/makedrum b/lilydrum/makedrum
index da650d6..549a7e9 100644
--- a/lilydrum/makedrum
+++ b/lilydrum/makedrum
@@ -11,20 +11,23 @@ from argparse import ArgumentParser
 class MakeDrum:
 	LILYPOND = 'lilypond'
 	VERSION  = '0.9.5'
-	TMP_DIR  = os.path.join(os.path.abspath(os.curdir),'tmp')
+	TMP_DIR  = './tmp'
 	TMP_PREFIX = 'tmp_'
 	MASTER_DIR = os.path.dirname(os.path.abspath(__file__))
 	RUN_DIR = os.path.abspath(os.curdir)
 
 	def __init__(self):
-		parser = ArgumentParser(__file__)
+		# Gather options and create the template file
+		usage = __file__
+		parser = ArgumentParser(usage)
 
-		parser.add_argument('--version', action='version', version=self.VERSION)
+		parser.add_argument('--version',
+			action='store_true', dest='show_version', default=False,
+			help='show makeDrum version and exit')
 		parser.add_argument('--lilyversion',
 			action='store_true', dest='show_lilyversion', default=False,
 			help='show Lilypond version and exit')
 
-		# options for inclusion of files
 		parser.add_argument('-x', '--drumfile',
 			dest='lilydrum', default='lilydrum.ly',
 			help='Use the specified file for drums')
@@ -35,7 +38,6 @@ class MakeDrum:
 			dest='includes', nargs='*', default=[],action='append',
 			help='Include the specified file for compiling')
 
-		# options for lilypond
 		parser.add_argument('-p', '--paper-size',
 			dest='papersize', default='a4',
 			help='Paper size. Default: A4')
@@ -44,20 +46,16 @@ class MakeDrum:
 			help='Paper orientation. Default: landscape')
 		parser.add_argument('-s', '--staff-size',
 			dest='staffsize', default='20',
-			help='Staff size. Default: 20pt.')
+			help='Staff size. Default: 16pt.')
 		parser.add_argument('-w', '--view-spacing',
-			action='store_const', dest='view_spacing', default='##f', const='##t',
+			action='store_true', dest='view_spacing', default=False,
 			help='Turn on "Paper.annotatespacing".')
-		parser.add_argument('-l', '--line-break',
-			action='store_const', dest='line_break', default='##t', const='##f',
-			help='Turn off explicit linebreaks".')
 
-		# options for generating and compiling
 		parser.add_argument('-g','--generated',
 			dest='gen_out', default=self.TMP_DIR,
 			help='Put generated lilyfiles in $gen_out')
-		parser.add_argument('--no-compile',
-			action='store_false', dest='compile', default=True,
+		parser.add_argument('--no-compile', default=True,
+			action='store_false', dest='compile',
 			help='Do not compile generated Lilypond files')
 		parser.add_argument('--no-log',
 			action='store_false', dest='log', default=True,
@@ -67,64 +65,72 @@ class MakeDrum:
 			help='Leave all temporary files in place')
 		parser.add_argument('-d', '--out_dir',
 			dest='out_dir', default='pdf',
-			help='Output dir for the lilypond process. If it doesn\'t exist, try to create it')
-
-		# the file(s) to process
+			help='Output dir, for lilypond. If it doesn\'t exist, try to create it')
 		parser.add_argument('music_file',
 			default='', nargs='*',
 			help='file to process')
 		parser.add_argument('-@', '--list_file',
 			dest='list_file', default='',
-			help='file containing the list of files to process')
+			help='list of files to process')
 
 		self.args = parser.parse_args()
 
+		if self.args.show_version:
+			print(__name__, ' ', self.VERSION)
+			return
+
 		if self.args.show_lilyversion:
 			print(os.system(self.LILYPOND+' --version'))
 			return
 
+		if self.args.view_spacing:
+			self.args.view_spacing = "##t"
+		else:
+			self.args.view_spacing = "##f"
+
 		# Input files
 		if self.args.list_file != '':
 			self.args.music_file.append(open(self.args.list_file, 'r').readlines())
 			close(self.args.list_file)
 
-		# Check if there are any files
+		# Check for files
 		if not self.args.music_file:
 			parser.print_usage()
 			return
 
-		# Check for inclusion options
+		# Check for files to include
 		self.args.includes = [el for elements in self.args.includes for el in elements]
 
-		# Whether to clean up tmp_dir if possible
+		# Clean up of files
 		self.remove_tmp_dir = self.args.clean
 
-		# are TMP_DIR, out_dir dirs?
-		if not os.path.exists(self.TMP_DIR):
-			try: os.makedirs(self.TMP_DIR)
+		if not os.path.exists(os.path.join(os.path.curdir, self.TMP_DIR)):
+			try: os.makedirs(os.path.join(os.path.curdir, self.TMP_DIR))
 			except:
 				print('Seems like no temporary directory can be created')
 				return
-		if not os.path.exists(self.args.out_dir):
-			try: os.makedirs(self.args.out_dir)
+		if not os.path.exists(os.path.join(os.path.curdir, self.args.out_dir)):
+			try: os.makedirs(os.path.join(os.path.curdir, self.args.out_dir))
 			except:
 				print('Seems like no output directory can be created')
 				return
 
-		# do the work!
+		os.chdir(self.MASTER_DIR)
 		for file_path in self.args.music_file:
-			self.process_it(file_path)
+			self.processit(self.TMP_DIR, os.path.join(self.RUN_DIR, file_path), self.args.gen_out, self.args.compile)
 
-		#if dir is empty:
+		#if not
 		#os.rmdir(self.TMP_DIR)
 
-	def process_it(self, file):
-		tmp_file = self.maketemplate(file)
+		os.chdir(self.RUN_DIR)
 
-		if self.args.gen_out is not None and self.args.gen_out != self.TMP_DIR:
+	def processit(self, tmp_dir, file, gen_out, compile):
+		tmp_file = self.maketemplate(tmp_dir, file)
+
+		if gen_out is not None and gen_out != tmp_dir:
 			new_tmp_file = os.path.basename(tmp_file).replace(self.TMP_PREFIX, '');
 			print ('Moving ', tmp_file, ' to ', new_tmp_file, end=' ', flush=True)
-			gen_dir = os.path.join(self.RUN_DIR, self.args.gen_out);
+			gen_dir = os.path.join(self.RUN_DIR, gen_out);
 			# if not dir $gen_out, make it
 			if not os.path.exists(gen_dir):
 				try: os.makedirs(gen_dir)
@@ -137,7 +143,7 @@ class MakeDrum:
 			tmp_file = new_tmp_file
 			print('[OK]')
 
-		if self.args.compile:
+		if compile:
 			if self.args.log:
 				logfile = os.path.join(self.TMP_DIR, os.path.relpath(file).replace(".ly", '').replace('/', '-')+'.log')
 				log = ' > '+logfile+' 2>&1'
@@ -147,7 +153,7 @@ class MakeDrum:
 			print ('Compiling ', file, end=' ', flush=True)
 			if not self.args.log:
 				print()
-			lilyout = os.path.join(self.args.out_dir, os.path.basename(tmp_file).replace(self.TMP_PREFIX, '').replace(".ly", ''))
+			lilyout = os.path.join(self.RUN_DIR, self.args.out_dir, os.path.basename(tmp_file).replace(self.TMP_PREFIX, '').replace(".ly", ''))
 			print (lilyout)
 			lilycmd = self.LILYPOND+' --pdf --output='+lilyout+' '+tmp_file+log
 
@@ -158,14 +164,14 @@ class MakeDrum:
 					print (' ! Did not compile, please see the log at ', logfile)
 			else :
 				print ('[OK]')
-
+	
 				if self.args.clean:
 					#remove files
 					if self.args.log:
 						os.remove(logfile)
 					os.remove(tmp_file)
 
-	def maketemplate(self,  file):
+	def maketemplate(self, tmp_dir, file):
 		lily_includes = ''
 		include_drum_file = False
 		include_pipe_file = False
@@ -189,46 +195,33 @@ class MakeDrum:
 		for f in self.args.includes:
 			lily_includes = lily_includes + "\n\\include \"{}\"".format(f)
 
-		# Set up a tmp file with template and file combined
-		tmp_file = self.TMP_PREFIX + os.path.relpath(file).replace('/', '-').replace('..', '').replace('//','').lstrip('-')
-		tmp_file = os.path.join(self.TMP_DIR, tmp_file)
+		# set up a tmp file with template and file combined
+		tmp_file = os.path.join(tmp_dir, self.TMP_PREFIX + os.path.relpath(file).replace('/', '-'))
+
 		out_file = codecs.open(tmp_file, 'w+', 'utf8')
 		out_file.write(u'\ufeff')
 
-		# Write the file
-		out_file.write(
-u"""% Generated from {filename} by {script} Version {version}
+		out_file.write(u"""
+% Generated from """+file+""" by """+__file__+""" version """+self.VERSION+"""
+
 \\version "2.18.0"
 
 #(ly:set-option 'point-and-click #f)
-{lily_includes}
+"""+ lily_includes +"""
 
-#(set-global-staff-size {staffsize})
-#(set-default-paper-size \"{papersize}\" '{orientation})
 
-\\paper {{
-    annotatespacing = {view_spacing}
-}}
-\layout {{
- \context {{
-   \Score {{
-     \override NonMusicalPaperColumn #'line-break-permission = {line_break}
-   }}
- }}
-}}
+#(set-global-staff-size """+self.args.staffsize+""")
+#(set-default-paper-size \""""+self.args.papersize+"""\" '"""+self.args.orientation+""")
+
+%\layout {
+% \context {
+%   \Score {
+%     \override NonMusicalPaperColumn #'line-break-permission = ##f
+%   }
+% }
+%}
 % The tune to generate.
-""".format(
-				filename=file,
-				script=__file__,
-				version=self.VERSION,
-				lily_includes=lily_includes,
-				staffsize=self.args.staffsize,
-				papersize=self.args.papersize,
-				orientation=self.args.orientation,
-				view_spacing=self.args.view_spacing,
-				line_break=self.args.line_break
-			)
-		)
+		""")
 
 		# Read lily file into tmp file
 		music = codecs.open(file, 'r', 'utf8').read()
@@ -236,10 +229,8 @@ u"""% Generated from {filename} by {script} Version {version}
 		music = music.split(u'\n')
 		printit = 1
 		for line in music:
+			if line.startswith(u'\\include "lilydrum.ly"'): continue
 			if line.startswith(u'\\include'):
-				if line.startswith(u'\\include "lilydrum.ly"'): continue
-				if line.startswith(u'\\include "bagpipe.ly"'): continue
-
 				# Rewrite includes to absolute location of file
 				incline = line.replace('\\include', '').strip('"\' ')
 				if not incline.startswith('\\'): #already absolute
@@ -251,6 +242,4 @@ u"""% Generated from {filename} by {script} Version {version}
 
 		# Return tmp_file_path
 		return tmp_file
-
-if __name__ == "__main__":
-	MakeDrum();
\ No newline at end of file
+MakeDrum();
diff --git a/music/2-4_marches/black_bear/Black_Bear_Hornpipe_The.ly b/music/2-4_marches/black_bear/Black_Bear_Hornpipe_The.ly
deleted file mode 100644
index c957c18..0000000
--- a/music/2-4_marches/black_bear/Black_Bear_Hornpipe_The.ly
+++ /dev/null
@@ -1,68 +0,0 @@
-\include "bagpipe.ly"
-melody = {
-		\set Staff.midiInstrument = #"bagpipe"
-		\hideKeySignature
-		\cadenzaOn
-		\once \override Score.BreakAlignment #'break-align-orders =
-			#(make-vector 3 '(instrument-name
-									left-edge
-									ambitus
-									span-bar
-									breathing-sign
-									clef
-									key-signature
-									time-signature
-									staff-bar
-									custos
-									span-bar))
-		\time 2/4
-		\bar "|:" \grg a16. [ b32 ] \bar "|"
- \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] \bar "|"
- \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] \bar "|"
- \dble e8 [ \grg b8 ] \grip b8 [ \grg e16 d16 ] \bar "|"
- \grg c32 [ d16. ] \grg b32 [ \grd c16. ] \grg a16. [ b32 \grg c32 \grd a16. ] \bar "|" \break
-
- \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] \bar "|"
- \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] \bar "|"
- \dble e8 [ \grip e8 ] \grg e16. [ g32 \grA f32 e16. ] \bar "|"
- \thrwd d8 [ \grg f8 ] \thrwd d8 \bar ":|" \break
- e8 \bar "|"
- \grg a16. [ \grd a32 a16 ] \grd b16 ] \thrwd d8 [ \grg d16 e16 ] \bar "|"
- \dblg g8 [ \grA f16 e16 ] \grg f32 [ A16. f16. d32 ] \bar "|"
- \grg a16. [ \grd a32 a16 ] \grd b16 ] \thrwd d8 [ \grg d16 e16 ] \bar "|"
- \dblg g8 [ \grA f16 e16 ] \grg f32 [ A16. f16. d32 ] \bar "|" \break
-
- A8 [ a16 \dbla a16 ] \grg c8 [ \grd a16 \dbla a16 ] \bar "|"
- \grg d8 [ b16 \dblb b16 ] \grg e8 [ c16 \dblc c16 ] \bar "|"
- \grg d32 [ f16. ] \grg d32 [ f16. ] e16. [ g32 \grA f32 g16. ] \bar "|"
- A8 [ \grip A8 ] \grg A16. [ g32 f16. ] e32 ] \bar ":|:" \break
-
- \bar "|"
- \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] \bar "|"
- \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] \bar "|"
- \dble e8 [ \grg b8 ] \grip b8 [ \grg e16 d16 ] \bar "|"
- \grg c32 [ d16. ] \grg b32 [ \grd c16. ] \grg a16. [ b32 \grg c32 \grd a16. ] \bar "|" \break
-
- \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] \bar "|"
- \thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] \bar "|"
- \dble e8 [ \grip e8 ] \grg e16. [ g32 \grA f32 e16. ] \bar "|"
- \thrwd d8 [ \grg f8 ] \set Score.repeatCommands = #'((volta "1"))  \thrwd d8 \grg a16. [ b32 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \set Score.repeatCommands = #'((volta "2"))  \thrwd d4 \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar ":|" \break
-
-			}
-
-\score {
-	\melody
-	\layout {
-	indent = 0.0\cm
-	\context { \Score \remove "Bar_number_engraver" }
-	}
-	\header {
-	title = "The Black Bear Hornpipe"
-	meter = "March"
-	arranger = "1936"
-	}
-	
-}
-
diff --git a/music/2-4_marches/black_bear/full.ly b/music/2-4_marches/black_bear/full.ly
index 6531a68..f61e4b3 100644
--- a/music/2-4_marches/black_bear/full.ly
+++ b/music/2-4_marches/black_bear/full.ly
@@ -14,25 +14,38 @@
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
-				{}%Format
-				{}%Pipes
+				{
+					\repeat volta 2 {
+						\part \line
+					}\break
+					\part \line \bar "||" \break
+					\line \bar "|."
+				}%Format
+				{
+					\pipesA s8
+					\pipesB
+					\pipesCA s8
+				}%Pipes
 			>>
 		}
 		\new PipeBandDrumStaff = "side" {
 			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
+				\snareA s8
+				\snareBA
+				\snareA s8
 		}
-		\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 = "bass" {
+%			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+%			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+%
+%		}
+%		\new PipeBandDrumStaff = "tenor" {
+%			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+%			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+%
+%		}
 	>>
 	\header {
 		title = \title
diff --git a/music/2-4_marches/black_bear/notes.pipes.ily b/music/2-4_marches/black_bear/notes.pipes.ily
index f90c57b..8b7dc84 100644
--- a/music/2-4_marches/black_bear/notes.pipes.ily
+++ b/music/2-4_marches/black_bear/notes.pipes.ily
@@ -4,13 +4,13 @@
 composerPipes = "1936"
 pipesA = {
 	\grg a16. [ b32 ] |
-	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] |
-	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] |
+	\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. ]
 
-	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] |
-	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] |
+	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16.  f32 ] |
+	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16.  f32 ] |
 	\dble e8 [ \grip e8 ] \grg e16. [ g32 \grA f32 e16. ] |
 	\thrwd d8 [ \grg f8 ] \thrwd d8 
 }
@@ -23,17 +23,17 @@ pipesB = {
 
 	A8 [ a16 \dbla a16 ] \grg c8 [ \grd a16 \dbla a16 ] |
 	\grg d8 [ b16 \dblb b16 ] \grg e8 [ c16 \dblc c16 ] |
-	\grg d32 [ f16. ] \grg d32 [ f16. ] e16. [ g32 \grA f32 g16. ] |
-	A8 [ \grip A8 ] \grg A16. [ g32 f16. ] e32 ] 
+	\grg d32 [ f16.  \grg d32  f16. ] e16. [ g32 \grA f32 g16. ] |
+	A8 [ \grip A8 ] \grg A16. [ g32 f16.  e32 ] 
 }
 pipesCA = {
-	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] |
-	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] |
+	\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. ]
 
-	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] |
-	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 ] A16. [ f32 ] |
+	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16.  f32 ] |
+	\thrwd d8 [ \dbld d8 ] \grg f16. [ d32 A16.  f32 ] |
 	\dble e8 [ \grip e8 ] \grg e16. [ g32 \grA f32 e16. ] |
-	\thrwd d8 [ \grg f8 ] \thrwd d8 \grg a16. [ b32 ]
-}
+	\thrwd d8 [ \grg f8 ] \thrwd d8
+	}
diff --git a/music/2-4_marches/black_bear/pipes.ly b/music/2-4_marches/black_bear/pipes.ly
index facb3fb..aaab560 100644
--- a/music/2-4_marches/black_bear/pipes.ly
+++ b/music/2-4_marches/black_bear/pipes.ly
@@ -8,8 +8,19 @@
 		\global
 		\bagpipeKey
 		<<
-            { }
-			{ }
+			{
+				\repeat volta 2 {
+					\part \line
+				}\break
+				\part \line \bar "||" \break
+				\line \bar "|."
+
+			}
+			{
+				\pipesA s8
+				\pipesB
+				\pipesCA
+			}
 		>>
 	}
 	\header {
@@ -18,4 +29,4 @@
 		instrument = \instrumentPipes
 		composer = \composerPipes
 	}
-}
\ No newline at end of file
+}
diff --git a/music/2-4_marches/brown_haired_maiden/config.ily b/music/2-4_marches/brown_haired_maiden/config.ily
new file mode 100644
index 0000000..8d76da5
--- /dev/null
+++ b/music/2-4_marches/brown_haired_maiden/config.ily
@@ -0,0 +1,14 @@
+\version "2.19.0"
+%% Globals
+global = {
+	\time 2/4
+	}
+
+%% Format
+part = { \partial 8 s8 }
+halfline = { \repeat unfold 4 { s2 | } }
+line = { \repeat unfold 2 { \halfline } }
+
+%% Headers
+title = "Brown Haired Maiden"
+meter = "March"
diff --git a/music/2-4_marches/brown_haired_maiden/notes.pipes.ily b/music/2-4_marches/brown_haired_maiden/notes.pipes.ily
new file mode 100644
index 0000000..f0e69bd
--- /dev/null
+++ b/music/2-4_marches/brown_haired_maiden/notes.pipes.ily
@@ -0,0 +1,36 @@
+% 2/4 Brown Haired Maiden
+% Pipes
+\version "2.18.2"
+composerPipes = "Trad."
+pipesA = {
+	\grg G8 [ \grd a8 ] \wbirl a8. [ b16 ] |
+	\thrwd d8. [ e16 ] \dblf f4 |
+	\dble e8 [ d8 ] \dblb b8 [ d8 ] |
+	\dblf f8 [ e8 ] \dblf f8 [ A8 ] |
+	
+	\grg G8 [ \grd a8 ] \wbirl a8. [ b16 ] |
+	\thrwd d8. [ e16 ] \dblf f4 |
+	\dble e8 [ d8 ] \dblb b8 [ \gre G8 ] |
+	\grg a4 \wbirl a4 
+}
+
+pipesB = {
+	\grg f8 [ A8 ] \grg A4 |
+	\grip A8. [ g16 ] \dblf f4 |
+	\dble e8 [ d8 ] \dblb b8 [ d8 ] |
+	\dblf f8 [ e8 ] \dblf f4 
+}
+
+pipesBA = {
+	\grg f8 [ A8 ] \grg A4
+	\grip A8. [ g16 ] \dblf f4 |
+	\dble e8 [ d8 ] \dblb b8 [ \gre G8 ] |
+	\grg a4 \wbirl a4 
+}
+
+pipesBB = {
+	\grg G8 [ \grd a8 ] \wbirl a8. [ b16 ] |
+	\thrwd d8. [ e16 ] \dblf f4 |
+	\dble e8 [ d8 ] \dblb b8 [ \gre G8 ] |
+	\grg a4 \wbirl a4 
+}
diff --git a/music/2-4_marches/brown_haired_maiden/pipes.ly b/music/2-4_marches/brown_haired_maiden/pipes.ly
new file mode 100644
index 0000000..dfb926c
--- /dev/null
+++ b/music/2-4_marches/brown_haired_maiden/pipes.ly
@@ -0,0 +1,41 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\bagpipeKey
+		<<
+			{ 
+				\repeat volta 2 {
+					\line
+				}
+				\break
+				\repeat volta 2 {
+					\halfline
+				}	
+				\alternative {
+					{\halfline}
+					{\halfline}
+				}
+	
+				\bar "|."
+			}
+			{ 
+			\pipesA
+
+			\pipesB
+			\pipesBA
+			\pipesBB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/music/2-4_marches/caller_herrin/.callerherrin.ly.swp b/music/2-4_marches/caller_herrin/.callerherrin.ly.swp
new file mode 100644
index 0000000..192a51e
Binary files /dev/null and b/music/2-4_marches/caller_herrin/.callerherrin.ly.swp differ
diff --git a/music/2-4_marches/caller_herrin/callerherrin.ly b/music/2-4_marches/caller_herrin/callerherrin.ly
new file mode 100644
index 0000000..14e5c5b
--- /dev/null
+++ b/music/2-4_marches/caller_herrin/callerherrin.ly
@@ -0,0 +1,69 @@
+\include "bagpipe.ly"
+melody = {
+		\set Staff.midiInstrument = #"bagpipe"
+		\hideKeySignature
+		\cadenzaOn
+		\once \override Score.BreakAlignment #'break-align-orders =
+			#(make-vector 3 '(instrument-name
+									left-edge
+									ambitus
+									span-bar
+									breathing-sign
+									clef
+									key-signature
+									time-signature
+									staff-bar
+									custos
+									span-bar))
+		\time 2/4
+		\bar "|:" \grg a8 \bar "|"
+ \grg d4 \grg d8 [ \grG e8 ] \bar "|"
+ \dblc c4 \thrwd d8. [ e16 ] \bar "|"
+ \dblf f8 [ b8 ] \dble e8. [ d16 ] \bar "|"
+ \dblc c8 [ \gre a8 ] \dblb b8 [ c8 ] \bar "|" \break
+
+ \grg d4 \grg d8 [ \grG e8 ] \bar "|"
+ \dblc c4 \thrwd d8. [ e16 ] \bar "|"
+ \dblf f8 [ g8 ] \grA e8. [ f16 ] \bar "|"
+ \thrwd d4 \slurd d8 \bar ":|" \break
+ A8 \bar "|"
+ \grf g8 [ f8 ] \dble e8 [ d8 ] \bar "|"
+ \dblc c8 [ b8 ] \grG a8 [ A8 ] \bar "|"
+ \grf g8 [ f8 ] \dble e8 [ d8 ] \bar "|"
+ \dblc c8 [ b8 ] \grG a8 [ A8 ] \bar "|" \break
+
+ \grf g8 [ f8 ] \dble e8 [ d8 ] \bar "|"
+ \dbld d8 [ c8 ] \grg d8. [ e16 ] \bar "|"
+ \dblf f8 [ b8 ] \dble e8. [ d16 ] \bar "|"
+ \dblc c8 [ \gre a8 ] \dblb b8 [ c8 ] \bar "|" \break
+
+ \grg d4 \grg d8 [ \grG e8 ] \bar "|"
+ \dblc c4 \thrwd d8. [ e16 ] \bar "|"
+ \dblf f8 [ g8 ] \grA e8. [ f16 ] \bar "|"
+ \thrwd d4 \slurd d8 A8 \bar ".|" \break 
+ g16 [ f16 ] \grg e16 [ d16 ] \grg c16 [ b16 ] \grG a16 [ A16 ] \bar "|"
+ g16 [ f16 ] \grg e16 [ d16 ] \grg c16 [ b16 ] \grG a16 [ A16 ] \bar "|"
+ g16 [ f16 ] \grg e16 [ d16 ] \grg d16 [ c16 ] \grg e16. [ f32 ] \bar "|"
+ \grg f16 [ b16 ] \grg e16. [ d32 ] \dblc c16 [ a16 ] \grg b16 [ c16 ] \bar "|" \break
+
+ \thrwd d8 [ \grg d16 \grG d16 ] \dblc c8 [ \grg d16. e32 ] \bar "|"
+ \grg f16 [ g16 ] \grA e16. [ f32 ] \set Score.repeatCommands = #'((volta "1"))  \thrwd d8 [ \slurd d16 A16 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \set Score.repeatCommands = #'((volta "2"))  \thrwd d8 [ \slurd d8 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar ":|" \break
+
+			}
+
+\score {
+	\melody
+	\layout {
+	indent = 0.0\cm
+	\context { \Score \remove "Bar_number_engraver" }
+	}
+	\header {
+	title = "Caller Herrin' "
+	meter = "March"
+	arranger = "Trad., arr. A.M. Cairns"
+	}
+	
+}
+
diff --git a/music/2-4_marches/caller_herrin/config.ily b/music/2-4_marches/caller_herrin/config.ily
new file mode 100644
index 0000000..3e9d1cd
--- /dev/null
+++ b/music/2-4_marches/caller_herrin/config.ily
@@ -0,0 +1,14 @@
+\version "2.19.0"
+%% Globals
+global = {
+	\time 2/4
+	}
+
+%% Format
+part = { \partial 8 s8 }
+halfline = { \repeat unfold 4 { s2 | } }
+line = { \repeat unfold 2 { \halfline } }
+
+%% Headers
+title = "Caller Herrin'"
+meter = "March"
diff --git a/music/2-4_marches/caller_herrin/notes.pipes.ily b/music/2-4_marches/caller_herrin/notes.pipes.ily
new file mode 100644
index 0000000..7700449
--- /dev/null
+++ b/music/2-4_marches/caller_herrin/notes.pipes.ily
@@ -0,0 +1,50 @@
+% <<TimeSig>> <<Title>>
+% Pipes
+\version "2.18.2"
+composerPipes = "Trad., arr: A.M. Cairns"
+pipesA = {
+	\grg a8 |
+	\grg d4 \grg d8 [ \grG e8 ] |
+	\dblc c4 \thrwd d8. [ e16 ] |
+	\dblf f8 [ b8 ] \dble e8. [ d16 ] |
+	\dblc c8 [ \gre a8 ] \dblb b8 [ c8 ] | 
+	
+	\grg d4 \grg d8 [ \grG e8 ] |
+	\dblc c4 \thrwd d8. [ e16 ] |
+	\dblf f8 [ g8 ] \grA e8. [ f16 ] |
+	\thrwd d4 \slurd d8
+}
+
+pipesB = {
+	A8 |
+	\grf g8 [ f8 ] \dble e8 [ d8 ] |
+	\dblc c8 [ b8 ] \grG a8 [ A8 ] |
+	\grf g8 [ f8 ] \dble e8 [ d8 ] |
+	\dblc c8 [ b8 ] \grG a8 [ A8 ] | 
+	
+	\grf g8 [ f8 ] \dble e8 [ d8 ] |
+	\dbld d8 [ c8 ] \grg d8. [ e16 ] |
+	\dblf f8 [ b8 ] \dble e8. [ d16 ] |
+	\dblc c8 [ \gre a8 ] \dblb b8 [ c8 ] | 
+	
+	\grg d4 \grg d8 [ \grG e8 ] |
+	\dblc c4 \thrwd d8. [ e16 ] |
+	\dblf f8 [ g8 ] \grA e8. [ f16 ] |
+	\thrwd d4 \slurd d8 A8 
+}
+
+pipesC = {
+	g16 [ f16 ] \grg e16 [ d16 ] \grg c16 [ b16 ] \grG a16 [ A16 ] |
+	g16 [ f16 ] \grg e16 [ d16 ] \grg c16 [ b16 ] \grG a16 [ A16 ] |
+	g16 [ f16 ] \grg e16 [ d16 ] \grg d16 [ c16 ] \grg e16. [ f32 ] |
+	\grg f16 [ b16 ] \grg e16. [ d32 ] \dblc c16 [ a16 ] \grg b16 [ c16 ] |
+
+	\thrwd d8 [ \grg d16 \grG d16 ] \dblc c8 [ \grg d16. e32 ] |
+	\grg f16 [ g16 ] \grA e16. [ f32 ]
+}
+pipesCA = {
+	\thrwd d8 [ \slurd d16 A16 ]
+}
+pipesCB = {
+	\thrwd d8 [ \slurd d8]
+}
diff --git a/music/2-4_marches/caller_herrin/pipes.ly b/music/2-4_marches/caller_herrin/pipes.ly
new file mode 100644
index 0000000..611a53e
--- /dev/null
+++ b/music/2-4_marches/caller_herrin/pipes.ly
@@ -0,0 +1,43 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\bagpipeKey
+		<<
+			{
+				\repeat volta 2 {
+					\part \line
+				}\break
+
+				\part \halfline \line
+
+				\repeat volta 2 {
+					\halfline s2 s1
+				}
+				\alternative {
+					{ s1 }
+					{s1}
+				}
+			}
+			{
+			\pipesA
+
+			\pipesB
+
+			\pipesC
+			\pipesCA
+			\pipesCB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/music/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/config.ily b/music/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/config.ily
new file mode 100644
index 0000000..7999301
--- /dev/null
+++ b/music/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/config.ily
@@ -0,0 +1,14 @@
+\version "2.19.0"
+%% Globals
+global = {
+	\time 2/4
+	}
+
+%% Format
+part = { \partial 8 s8 }
+halfline = { \repeat unfold 4 { s2 | } }
+line = { \repeat unfold 2 { \halfline } }
+
+%% Headers
+title = "Corriechoillie's 43rd Welcome to the Northern Meeting"
+meter = "March"
diff --git a/music/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/notes.pipes.ily b/music/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/notes.pipes.ily
new file mode 100644
index 0000000..e95a4ee
--- /dev/null
+++ b/music/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/notes.pipes.ily
@@ -0,0 +1,36 @@
+% 2/4 Teribus
+% Pipes
+\version "2.18.2"
+composerPipes = "PM W. Ross, arr. PM G.J. van Achterbergh"
+pipesA = {
+	e8 |
+	\grg a8. [ b16 ] \grG a8 [ \thrwd d8 ] |
+	\grg e8. [ d16 ] \dblb b8 [ \gre a8 ] |
+	\thrwd d8. [ e16 ] \grg f8 [ A8 ] |
+	\hdblf f8 [ \grg e8 ] \gra e8 [ f8 ] |
+
+	\grg a8. [ b16 ] \grG a8 [ \thrwd d8 ] |
+	\grg e8. [ d16 ] \dblb b8 [ \gre a8 ] |
+	\thrwd d8. [ e16 ] \grg f8 [ A8 ] |
+	\hdblf f8 [ d8 ] \dbld d8 
+}
+pipesB = {
+	\dblg g8 
+	\dblA A8. [ f16 ] \thrwd d8 [ f8 ] 
+	\grg e8. [ d16 ] \dblb b8 [ \gre a8 ] 
+	\thrwd d8. [ e16 ] \grg f8 [ A8 ] 
+	\hdblf f8 [ \grg e8 ] \gra e8 [ \dblg g8 ]
+}
+
+pipesBA = {
+	\dblA A8. [ f16 ] \thrwd d8 [ f8 ] 
+	\grg e8. [ d16 ] \dblb b8 [ \gre a8 ] 
+	\thrwd d8. [ e16 ] \grg f8 [ A8 ] 
+	\hdblf f8 [ d8 ] \dbld d8 
+}
+pipesBB = {
+	\grg a8. [ b16 ] \grG a8 [ \thrwd d8 ] 
+	\grg e8. [ d16 ] \dblb b8 [ \gre a8 ] 
+	\thrwd d8. [ e16 ] \grg f8 [ A8 ] 
+	\hdblf f8 [ d8 ] \dbld d8 
+}
diff --git a/music/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/pipes.ly b/music/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/pipes.ly
new file mode 100644
index 0000000..5c085e0
--- /dev/null
+++ b/music/2-4_marches/corriechoillie_welcome_to_the_43rd_northern_meeting/pipes.ly
@@ -0,0 +1,41 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\bagpipeKey
+		<<
+			{
+				\repeat volta 2 {
+					\part \line
+				}
+				\break
+				\repeat volta 2 {
+					\part \halfline
+				}	
+				\alternative {
+					{\halfline}
+					{\halfline}
+				}
+	
+				\bar "|."
+			}
+			{
+				\pipesA s8
+				
+				\pipesB
+				\pipesBA s8
+				\pipesBB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/music/2-4_marches/duncan_mcinness/notes.side.ily b/music/2-4_marches/duncan_mcinness/notes.side.ily
index da43ca6..b6bd467 100644
--- a/music/2-4_marches/duncan_mcinness/notes.side.ily
+++ b/music/2-4_marches/duncan_mcinness/notes.side.ily
@@ -20,11 +20,11 @@ snareA = \drummode {
 }
 % Part 2
 snareB = \drummode {
-	r16. g32 |
+	r16 g16 |
 	\flamd d8 d16. g32->		d16. d32 \flamg g8 |
 	\tuplet 3/2 { d16 g d-> } \tuplet 3/2 { g16 d g-> }		d8:32( g8) |
 
-	\flamd d8. d16		\flamg g16 r16 g16 \flamd d16 |
+	\flamd d8. d16		\flamg g8 g16 \flamd d16 |
 	\flamd d16. g32 \tuplet 3/2 { d16 g d }		\flamg g8. g16 |
 
 	\flamd d8 d16. g32->		d16. d32 \flamg g8 |
@@ -80,4 +80,4 @@ snareDAC = \drummode {
 
 		\flamd d8 d8:32(	g4)
 		\bar "|."
-}
\ No newline at end of file
+}
diff --git a/music/2-4_marches/mackenzie_highlanders/config.ily b/music/2-4_marches/mackenzie_highlanders/config.ily
index e06e3f9..158aa55 100644
--- a/music/2-4_marches/mackenzie_highlanders/config.ily
+++ b/music/2-4_marches/mackenzie_highlanders/config.ily
@@ -2,20 +2,13 @@
 %% Globals
 global = {
 	\time 2/4
-	\eighthBeaming
 	}
 
 %% Format
 part = { \partial 8 s8 }
-halfline = { \repeat unfold 2 { s1 | } }
+halfline = { \repeat unfold 4 { s2 | } }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
-title = "MacKenzie Highlanders"
-meter = "Trooping of the Colours"
-
-
-composerSide  = ""
-composerTenor = ""
-composerBass  = ""
-composerPipes = ""
\ No newline at end of file
+title = "Mackenzie Highlanders"
+meter = "March on the Colours / Fall In"
diff --git a/music/2-4_marches/mackenzie_highlanders/full.ly b/music/2-4_marches/mackenzie_highlanders/full.ly
new file mode 100644
index 0000000..bb7dc2a
--- /dev/null
+++ b/music/2-4_marches/mackenzie_highlanders/full.ly
@@ -0,0 +1,73 @@
+\version "2.19.0"
+
+\include "config.ily"
+%\include "notes.bass.ily"
+%\include "notes.tenor.ily"
+\include "notes.side.alt.ily"
+\include "notes.pipes.ily"
+
+\score {
+	\new StaffGroup <<
+		\new Staff {
+			\global
+			\bagpipeKey
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
+			<<
+				{
+				\repeat volta 2 {
+					\part \line
+				}\break
+
+				\part \line \bar "||" \break
+				\line \bar "|."
+				}%Format
+				{
+				\pipesA s8
+
+				\pipesB
+				\pipesBA
+				\pipesB
+				\pipesBB
+				}%Pipes
+			>>
+		}
+		\new PipeBandDrumStaff = "side" {
+			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+
+		\snareA s8
+		\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 }
+%
+%		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup \large {
+			\column \right-align {
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
+				$(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=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}
diff --git a/music/2-4_marches/mackenzie_highlanders/notes.pipes.ily b/music/2-4_marches/mackenzie_highlanders/notes.pipes.ily
new file mode 100644
index 0000000..f85535b
--- /dev/null
+++ b/music/2-4_marches/mackenzie_highlanders/notes.pipes.ily
@@ -0,0 +1,38 @@
+% <<TimeSig>> <<Title>>
+% Pipes
+\version "2.18.2"
+composerPipes = ""
+pipesA = {
+	\dblA A8 |
+	\dblc c8 [ \gre b16. \grd c32 ] \grg a16. [ b32  \grg c16.  d32 ] |
+	\dble e8 [ \grg a8 ] \wbirl a8 [ \dblA A8 ] |
+	\hdblc c8 [ \gre b16. \grd c32 ] \grg a16. [ b32  \grg c16.  d32 ] |
+	\dble e4 \grip e8 [ \dblA A8 ] | \break
+
+	\hdblc c8 [ \gre b16. \grd c32 ] \grg a16. [ b32  \grg c16.  d32 ] |
+	\dble e8 [ \grg a8 ] \wbirl a8 [ \dblg g8 ] |
+	\hdblb b8 [ \grg a32 \grd G16. ] \dblg g8 [ \grA b32 \grd G16. ] |
+	d4 \dbld d8 
+}
+
+pipesB = {
+	\dblg g8 |
+	\dblA A8 [ c32 \grd a16. ] \grip e8 [ \grg f16. d32 ] |
+	\dble e8 [ \grg a8 ] \wbirl a8 [ \dblg g8 ] |
+	\dblA A8 [ c32 \grd a16. ] \grip e8 [ \grg f16. d32 ] |
+	\dble e4 \gra e8 [ \dblg g8 ] | 
+}
+
+pipesBA = {
+	\dblA A8 [ c32 \grd a16. ] \grip e8 [ \grg f16. d32 ] |
+	\dble e8 [ \grg a8 ] \wbirl a8 [ \dblg g8 ] |
+	\hdblb b8 [ \grg a32 \grd G16. ] \dblg g8 [ \grA b32 \grd G16. ] |
+	d4 \dbld d8 
+}
+
+pipesBB = {
+	\dblA A8 [ g32 f16. ] \dblg g8 [ f32 e16. ] |
+	\dblf f8 [ e32 d16. ] \dble e8 [ f32 g16. ] |
+	\hdblb b8 [ \grg a32 \grd G16. ] \dblg g8 [ b32 \grd G16. ] |
+	d4 \dbld d8 
+}
diff --git a/music/2-4_marches/mackenzie_highlanders/pipes.ly b/music/2-4_marches/mackenzie_highlanders/pipes.ly
new file mode 100644
index 0000000..0c1feac
--- /dev/null
+++ b/music/2-4_marches/mackenzie_highlanders/pipes.ly
@@ -0,0 +1,40 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\bagpipeKey
+		<<
+			{
+				\repeat volta 2 {
+					\part \line
+				}
+				\break
+				\repeat volta 2 {
+					\part \halfline
+				}	
+				\alternative {
+					{\halfline}
+					{\halfline}
+				}
+	
+				\bar "|."
+			}
+			{
+				\pipesA s8
+				
+				\pipesB
+				\pipesBA s8
+				\pipesBB
+			}		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/music/2-4_marches/pipers_cave/config.ily b/music/2-4_marches/pipers_cave/config.ily
new file mode 100644
index 0000000..35e8848
--- /dev/null
+++ b/music/2-4_marches/pipers_cave/config.ily
@@ -0,0 +1,14 @@
+\version "2.19.0"
+%% Globals
+global = {
+	\time 2/4
+	}
+
+%% Format
+part = { \partial 8 s8 }
+halfline = { \repeat unfold 4 { s2 | } }
+line = { \repeat unfold 2 { \halfline } }
+
+%% Headers
+title = "Piper's Cave"
+meter = "March"
diff --git a/music/2-4_marches/pipers_cave/notes.pipes.ily b/music/2-4_marches/pipers_cave/notes.pipes.ily
new file mode 100644
index 0000000..2a5eeca
--- /dev/null
+++ b/music/2-4_marches/pipers_cave/notes.pipes.ily
@@ -0,0 +1,38 @@
+% 2/4 Pipers Cave
+% Pipes
+\version "2.18.2"
+composerPipes = "PM J. Sutherland, 1936"
+pipesA = {
+	\dblc c16. [ b32 ] |
+	\grg a4 \wbirl a8. [ b16 ] |
+	\grip c8 [ f8 ] \slure f8 [ A16 f16 ] |
+	\dble e8 [ c8 ] \dblc c8 [ \grg b16 \grd a16 ] |
+	\dblc c8 [ \grg b8 ] \taor b8 [ \dblc c16. b32 ] | \break
+	
+	\grg a4 \wbirl a8. [ b16 ] |
+	\grip c8 [ f8 ] \slure f8 [ A16 f16 ] |
+	\dble e8. [ c16 ] \grg b8 [ \dblc c16 b16 ] |
+	\grg a4 \wbirl a8 
+}
+
+pipesB = {
+	 \dblg g8 |
+	 \dblA A8 [ f8 ] \dblf f8 [ e16 f16 ] |
+	 \dblA A8 [ c8 ] \grip c8 [ A16 f16 ] |
+	 \dble e8 [ c8 ] \dblc c8 [ \grg b16 \grd a16 ] |
+	 \dblc c8 [ \grg b8 ] \taor b8 
+}
+pipesBA = {
+	\dblg g8 |
+	\dblA A8 [ f8 ] \dblf f8 [ e16 f16 ] |
+	\dblA A8 [ c8 ] \grip c8 [ A16 f16 ] |
+	\dble e8. [ c16 ] \grg b8 [ \dblc c16 b16 ] |
+	\grg a4 \wbirl a8 
+}
+pipesBB = {
+	\dblc c16. [ b32 ] |
+	\grg a4 \wbirl a8. [ b16 ] |
+	\grip c8 [ f8 ] \slure f8 [ A16 f16 ] |
+	\dble e8. [ c16 ] \grg b8 [ \dblc c16 b16 ] |
+	\grg a4 \wbirl a4 
+}
diff --git a/music/2-4_marches/pipers_cave/pipes.ly b/music/2-4_marches/pipers_cave/pipes.ly
new file mode 100644
index 0000000..7033850
--- /dev/null
+++ b/music/2-4_marches/pipers_cave/pipes.ly
@@ -0,0 +1,41 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\bagpipeKey
+		<<
+			{
+				\repeat volta 2 {
+					\part \line
+				}
+				\break
+				\repeat volta 2 {
+					\part s2*3 s4 s8
+				}	
+				\alternative {
+					{s8 \halfline}
+					{s8 \halfline}
+				}
+	
+				\bar "|."
+			}
+			{
+				\pipesA s8
+
+				\pipesB
+				\pipesBA s8
+				\pipesBB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/music/2-4_marches/teribus/config.ily b/music/2-4_marches/teribus/config.ily
new file mode 100644
index 0000000..ef05fab
--- /dev/null
+++ b/music/2-4_marches/teribus/config.ily
@@ -0,0 +1,14 @@
+\version "2.19.0"
+%% Globals
+global = {
+	\time 2/4
+	}
+
+%% Format
+part = { \partial 8 s8 }
+halfline = { \repeat unfold 4 { s2 | } }
+line = { \repeat unfold 2 { \halfline } }
+
+%% Headers
+title = "Teribus"
+meter = "March"
diff --git a/music/2-4_marches/teribus/notes.pipes.ily b/music/2-4_marches/teribus/notes.pipes.ily
new file mode 100644
index 0000000..8f1fb2b
--- /dev/null
+++ b/music/2-4_marches/teribus/notes.pipes.ily
@@ -0,0 +1,37 @@
+% 2/4 Teribus
+% Pipes
+\version "2.18.2"
+composerPipes = "Trad., arr. PM G.J. van Achterbergh"
+pipesA = {
+	a8 |
+	\thrwd d8 [ \gre a8 ] \thrwd d8. [ e16 ] |
+	\grg f8 [ A8 ] \hdblf f8 [ d8 ] |
+	\dblg g8. [ f16 ] \dble e8. [ d16 ] |
+	\dblc c8 [ e8 ] \dblc c8 [ a8 ] |
+	
+	\thrwd d8 [ \gre a8 ] \thrwd d8. [ e16 ] |
+	\grg f8 [ A8 ] \hdblf f8 [ d8 ] |
+	\dblg g8. [ f16 ] \dble e8. [ A16 ] |
+	\hdblf f8 [ d8 ] \dbld d8 |
+}
+pipesB = {
+	\dblg g8 
+	A4 \grip A8. [ g16 ] 
+	\grg f8 [ A8 ] \hdblf f8 [ d8 ] 
+	\dblg g8. [ f16 ] \dble e8. [ d16 ] 
+	\dblc c8 [ e8 ] \dblc c8 [ a8 ]
+}
+
+pipesBA = {
+	A4 \grip A8. [ g16 ] 
+	\grg f8 [ A8 ] \hdblf f8 [ d8 ] 
+	\dblg g8. [ f16 ] \dble e8. [ A16 ] 
+	\hdblf f8 [ d8 ] \dbld d8 
+}
+
+pipesBB = {
+	\thrwd d8 [ \gre a8 ] \thrwd d8. [ e16 ] 
+	\grg f8 [ A8 ] \hdblf f8 [ d8 ] 
+	\dblg g8. [ f16 ] \dble e8. [ A16 ] 
+	\hdblf f8 [ d8 ] \dbld d8 
+}
diff --git a/music/2-4_marches/teribus/pipes.ly b/music/2-4_marches/teribus/pipes.ly
new file mode 100644
index 0000000..5c085e0
--- /dev/null
+++ b/music/2-4_marches/teribus/pipes.ly
@@ -0,0 +1,41 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\bagpipeKey
+		<<
+			{
+				\repeat volta 2 {
+					\part \line
+				}
+				\break
+				\repeat volta 2 {
+					\part \halfline
+				}	
+				\alternative {
+					{\halfline}
+					{\halfline}
+				}
+	
+				\bar "|."
+			}
+			{
+				\pipesA s8
+				
+				\pipesB
+				\pipesBA s8
+				\pipesBB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/music/3-4_marches/ballad_of_the_green_berets/config.ily b/music/3-4_marches/ballad_of_the_green_berets/config.ily
new file mode 100644
index 0000000..818343f
--- /dev/null
+++ b/music/3-4_marches/ballad_of_the_green_berets/config.ily
@@ -0,0 +1,13 @@
+\version "2.19.0"
+%% Globals
+global = {
+	\time 3/4
+	}
+%% Format
+part = { \partial 8 s8 }
+halfline = { \repeat unfold 4 { s2. | } }
+line = { \repeat unfold 2 { \halfline } }
+
+%% Headers
+title = "The Ballad of the Green Berets"
+meter = "March of the Korps Commando Troepen"
diff --git a/music/3-4_marches/ballad_of_the_green_berets/notes.pipes.ily b/music/3-4_marches/ballad_of_the_green_berets/notes.pipes.ily
new file mode 100644
index 0000000..5c9ab98
--- /dev/null
+++ b/music/3-4_marches/ballad_of_the_green_berets/notes.pipes.ily
@@ -0,0 +1,18 @@
+% <<TimeSig>> <<Title>>
+% Pipes
+\version "2.18.2"
+composerPipes = ""
+pipeglobal = {
+	\bagpipeKey
+	}
+pipesA = {
+
+}
+
+pipesB = {
+
+}
+
+pipesC = {
+
+}
diff --git a/music/3-4_marches/ballad_of_the_green_berets/pipes.ly b/music/3-4_marches/ballad_of_the_green_berets/pipes.ly
new file mode 100644
index 0000000..efa0ca2
--- /dev/null
+++ b/music/3-4_marches/ballad_of_the_green_berets/pipes.ly
@@ -0,0 +1,33 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			{
+				\repeat volta 2 { \line }
+				\break
+				\repeat volta 2 { \line }
+				\break
+				\repeat volta 2 { \line }
+			}
+			{ 
+				\pipesA
+
+				\pipesB
+
+				\pipesC
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/music/3-4_marches/balmoral/config.ily b/music/3-4_marches/balmoral/config.ily
new file mode 100644
index 0000000..77b6688
--- /dev/null
+++ b/music/3-4_marches/balmoral/config.ily
@@ -0,0 +1,13 @@
+\version "2.19.0"
+%% Globals
+global = {
+	\time 3/4
+	}
+%% Format
+part = { \partial 8 s8 }
+halfline = { \repeat unfold 4 { s2. | } }
+line = { \repeat unfold 2 { \halfline } }
+
+%% Headers
+title = "Balmoral"
+meter = "Retreat"
diff --git a/music/3-4_marches/balmoral/first.ly b/music/3-4_marches/balmoral/first.ly
new file mode 100644
index 0000000..f0efac1
--- /dev/null
+++ b/music/3-4_marches/balmoral/first.ly
@@ -0,0 +1,54 @@
+\include "bagpipe.ly"
+melody = {
+		\set Staff.midiInstrument = #"bagpipe"
+		\hideKeySignature
+		\cadenzaOn
+		\once \override Score.BreakAlignment #'break-align-orders =
+			#(make-vector 3 '(instrument-name
+									left-edge
+									ambitus
+									span-bar
+									breathing-sign
+									clef
+									key-signature
+									time-signature
+									staff-bar
+									custos
+									span-bar))
+		\time 3/4
+		\bar "|:" \grg a8. [ b16 ] \grip c4 \grg e4 \bar "|"
+ \grg a8. [ b16 ] \grip c2 \bar "|"
+ \dblb b8 [ \gre a8 ] \grg b2 \bar "|"
+ \grg c16. [ b32 \grg a16. b32 ] \grip c2 \bar "|" \break
+
+ \grg a8. [ b16 ] \grip c4 \grg e4 \bar "|"
+ \grg a8. [ b16 ] \grip c2 \bar "|"
+ \dblb b8 [ \gre a8 ] \grg b4 \thrwd d4 \bar "|"
+ \dblc c8. [ b16 ] \grg a2 \bar ":|:" \break
+
+ \thrwd d8 [ e8 ] \grg f4 \dblA A4 \bar "|"
+ \grf g8 [ f8 ] \grg e2 \bar "|"
+ \dbld d8 [ c8 ] \grg b2 \bar "|"
+ \grg c16. [ b32 \grg a16. b32 ] \grip c2 \bar "|" \break
+
+ \thrwd d8 [ e8 ] \grg f4 \dblA A4 \bar "|"
+ \grf g8 [ f8 ] \grg e2 \bar "|"
+ \dbld d8 [ c8 ] \grg b4 \thrwd d4 \bar "|"
+ \dblc c8. [ b16 ] \grg a2 \bar ":|" \break
+
+			}
+
+\score {
+	\melody
+	\layout {
+	indent = 0.0\cm
+	\context { \Score \remove "Bar_number_engraver" }
+	}
+	\header {
+	title = "Balmoral"
+	meter = "Retreat"
+	arranger = "Arr. G. Rooney/The Seaforth Highlanders of Holland"
+	}
+	
+}
+
diff --git a/music/3-4_marches/balmoral/notes.pipes.ily b/music/3-4_marches/balmoral/notes.pipes.ily
new file mode 100644
index 0000000..feec43d
--- /dev/null
+++ b/music/3-4_marches/balmoral/notes.pipes.ily
@@ -0,0 +1,29 @@
+% 3/4 Balmoral
+% Pipes
+\version "2.18.2"
+composerPipes = "Arr. G. Rooney/Seaforths of Holland"
+pipeglobal = {
+	\bagpipeKey
+	}
+pipesA = {
+	\grg a8. [ b16 ] \grip c4 \grg e4 |
+	\grg a8. [ b16 ] \grip c2 |
+	\dblb b8 [ \gre a8 ] \grg b2 |
+	\grg c16. [ b32 \grg a16. b32 ] \grip c2 |
+
+	\grg a8. [ b16 ] \grip c4 \grg e4 |
+	\grg a8. [ b16 ] \grip c2 |
+	\dblb b8 [ \gre a8 ] \grg b4 \thrwd d4 |
+	\dblc c8. [ b16 ] \grg a2 
+}
+pipesB = {
+	\thrwd d8 [ e8 ] \grg f4 \dblA A4 |
+	\grf g8 [ f8 ] \grg e2 |
+	\dbld d8 [ c8 ] \grg b2 |
+	\grg c16. [ b32 \grg a16. b32 ] \grip c2 |
+
+	\thrwd d8 [ e8 ] \grg f4 \dblA A4 |
+	\grf g8 [ f8 ] \grg e2 |
+	\dbld d8 [ c8 ] \grg b4 \thrwd d4 |
+	\dblc c8. [ b16 ] \grg a2 
+}
diff --git a/music/3-4_marches/balmoral/notes.pipes.seconds.ily b/music/3-4_marches/balmoral/notes.pipes.seconds.ily
new file mode 100644
index 0000000..7f0d72e
--- /dev/null
+++ b/music/3-4_marches/balmoral/notes.pipes.seconds.ily
@@ -0,0 +1,29 @@
+% 3/4 Balmoral (seconds)
+% Pipes
+\version "2.18.2"
+composerPipessecnd = ""
+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 \bar "|"
+	c8. [ d16 ] \dble e2 \bar "|"
+	\dbld d8 [ c8 ] \grg d4 \dblf f4 \bar "|"
+	\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 \bar "|"
+	\grg e8 [ d8 ] \grg c2 \bar "|"
+	\dblf f8 [ e8 ] \grg d4 \dblf f4 \bar "|"
+	\grg e8. [ d16 ] \grg c2 
+}
diff --git a/music/3-4_marches/balmoral/notes.pipes.thirds.ily b/music/3-4_marches/balmoral/notes.pipes.thirds.ily
new file mode 100644
index 0000000..d7bc670
--- /dev/null
+++ b/music/3-4_marches/balmoral/notes.pipes.thirds.ily
@@ -0,0 +1,29 @@
+% 3/4 Balmoral (thirds)
+% Pipes
+\version "2.18.2"
+composerPipesthrd = ""
+pipesthrdglobal = {
+	\bagpipeKey
+	}
+pipesthrdA = {
+	\grg c8. [ d16 ] \grg e8 [ c8 ] \grg f8 [ A8 ] |
+	\grf g8 [ f8 ] \grg f8 [ c8 ] \grg f4 |
+	\grg d8 [ c8 ] \thrwd d8. [ c16 ] \grg b8 [ c8 ] |
+	\thrwd d8 [ f8 ] \grg e16. [ d32 c16. d32] \grg e4 |
+
+	\grg c8. [ d16 ] \grg e8 [ c8 ] \grg f8 [ A8 ] |
+	\grf g8 [ f8 ] \grg f8 [ c8 ] \grg f4 |
+	\grg d8 [ c8 ] \thrwd d8. [ c16 ] \grg b8 [ f8 ] |
+	\grg e16 [ f16 g8 ] \dblA A2
+}
+pipesthrdB = {
+	A2. |
+	\dblf f8 [ d8 ] \dblg g8 [ A8 ] \grf g8 [ A8 ] |
+	e4 \thrwd d4 \grg d8 [ c8 ] |
+	\grg b8 [ f8 ] \grg e16. [ d32 c16. d32 ] \grg e4 |
+
+	A2. |
+	\dblf f8 [ d8 ] \dblg g8 [ A8 ] \grf g8 [ A8 ] |
+	e4 \thrwd d4 \grg d8 [ f8 ] |
+	\grg e16 [ f16 g8 ] \dblA A2
+}
diff --git a/music/3-4_marches/balmoral/pipes.full.ly b/music/3-4_marches/balmoral/pipes.full.ly
new file mode 100644
index 0000000..97c5e59
--- /dev/null
+++ b/music/3-4_marches/balmoral/pipes.full.ly
@@ -0,0 +1,63 @@
+\version "2.19.0"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+\include "notes.pipes.seconds.ily"
+\include "notes.pipes.thirds.ily"
+
+\score {
+	\new StaffGroup <<
+		\new Staff = "pipes"  {
+			\global
+			\pipeglobal
+			\set Staff.instrumentName = \markup{ \instrumentPipes }
+			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes }
+			<<
+				{
+					\repeat volta 2 { \line }
+					\break
+					\repeat volta 2 { \line }
+				}%Format
+				{
+					\pipesA
+					
+					\pipesB
+				}%Pipes
+			>>
+		}
+		\new Staff = "seconds" {
+			\pipessecndglobal
+			\set Staff.instrumentName = \markup{ \instrumentPipes Seconds }
+			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes 2nd}
+			
+			\pipessecndA
+
+			\pipessecndB
+		}
+		\new Staff = "thirds" {
+			\pipesthrdglobal
+			\set Staff.instrumentName = \markup{ \instrumentPipes Thirds }
+			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes 3rd }
+
+			\pipesthrdA
+
+			\pipesthrdB
+		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup \large {
+			\column \right-align {
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \composerPipessecnd ":" }} #} )
+				$(if (not (string=? "" composerPipesthrd))  #{ \markup {\line { \composerPipesthrd  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \instrumentPipessecnd }}#} )
+				$(if (not (string=? "" composerPipesthrd))  #{ \markup {\line { \instrumentPipesthrd }}#} )
+			}
+		}
+	}
+}
diff --git a/music/3-4_marches/balmoral/pipes.ly b/music/3-4_marches/balmoral/pipes.ly
new file mode 100644
index 0000000..06df072
--- /dev/null
+++ b/music/3-4_marches/balmoral/pipes.ly
@@ -0,0 +1,29 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			{
+				\repeat volta 2 { \line }
+				\break
+				\repeat volta 2 { \line }
+			}
+			{
+				\pipesA
+
+				\pipesB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/music/3-4_marches/balmoral/pipes.seconds.ly b/music/3-4_marches/balmoral/pipes.seconds.ly
new file mode 100644
index 0000000..666a969
--- /dev/null
+++ b/music/3-4_marches/balmoral/pipes.seconds.ly
@@ -0,0 +1,29 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.seconds.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipessecndglobal
+		<<
+			{
+				\repeat volta 2 { \line }
+				\break
+				\repeat volta 2 { \line }
+			}
+			{
+				\pipessecndA
+
+				\pipessecndB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipessecnd
+		composer = \composerPipessecnd
+	}
+}
diff --git a/music/3-4_marches/balmoral/pipes.thirds.ly b/music/3-4_marches/balmoral/pipes.thirds.ly
new file mode 100644
index 0000000..ee0f955
--- /dev/null
+++ b/music/3-4_marches/balmoral/pipes.thirds.ly
@@ -0,0 +1,29 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.thirds.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipesthrdglobal
+		<<
+			{
+				\repeat volta 2 { \line }
+				\break
+				\repeat volta 2 { \line }
+			}
+			{
+				\pipesthrdA
+
+				\pipesthrdB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipesthrd
+		composer = \composerPipesthrd
+	}
+}
diff --git a/music/3-4_marches/balmoral/seconds.ly b/music/3-4_marches/balmoral/seconds.ly
new file mode 100644
index 0000000..403dab6
--- /dev/null
+++ b/music/3-4_marches/balmoral/seconds.ly
@@ -0,0 +1,54 @@
+\include "bagpipe.ly"
+melody = {
+		\set Staff.midiInstrument = #"bagpipe"
+		\hideKeySignature
+		\cadenzaOn
+		\once \override Score.BreakAlignment #'break-align-orders =
+			#(make-vector 3 '(instrument-name
+									left-edge
+									ambitus
+									span-bar
+									breathing-sign
+									clef
+									key-signature
+									time-signature
+									staff-bar
+									custos
+									span-bar))
+		\time 3/4
+		\bar "|:" \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 \bar "|"
+ c8. [ d16 ] \dble e2 \bar "|"
+ \dbld d8 [ c8 ] \grg d4 \dblf f4 \bar "|"
+ \grg e8. [ d16 ] \grg c2 \bar ":|:" \break
+
+ 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 \bar "|"
+ \grg e8 [ d8 ] \grg c2 \bar "|"
+ \dblf f8 [ e8 ] \grg d4 \dblf f4 \bar "|"
+ \grg e8. [ d16 ] \grg c2 \bar ":|" \break
+
+			}
+
+\score {
+	\melody
+	\layout {
+	indent = 0.0\cm
+	\context { \Score \remove "Bar_number_engraver" }
+	}
+	\header {
+	title = "Balmoral"
+	meter = "Retreat"
+	arranger = "Arr. G. Rooney/The Seaforth Highlanders of Holland"
+	}
+	
+}
+
diff --git a/music/3-4_marches/balmoral/thirds.ly b/music/3-4_marches/balmoral/thirds.ly
new file mode 100644
index 0000000..4dfadca
--- /dev/null
+++ b/music/3-4_marches/balmoral/thirds.ly
@@ -0,0 +1,54 @@
+\include "bagpipe.ly"
+melody = {
+		\set Staff.midiInstrument = #"bagpipe"
+		\hideKeySignature
+		\cadenzaOn
+		\once \override Score.BreakAlignment #'break-align-orders =
+			#(make-vector 3 '(instrument-name
+									left-edge
+									ambitus
+									span-bar
+									breathing-sign
+									clef
+									key-signature
+									time-signature
+									staff-bar
+									custos
+									span-bar))
+		\time 3/4
+		\bar "|:" \grg c8. [ d16 ] \grg e8 [ c8 ] \grg f8 [ A8 ] \bar "|"
+ \grf g8 [ f8 ] \grg f8 [ c8 ] \grg f4 \bar "|"
+ \grg d8 [ c8 ] \thrwd d8. [ c16 ] \grg b8 [ c8 ] \bar "|"
+ \thrwd d8 [ f8 ] \grg e16. [ d32 ] d32 ] \grg e4 \bar "|" \break
+
+ \grg c8. [ d16 ] \grg e8 [ c8 ] \grg f8 [ A8 ] \bar "|"
+ \grf g8 [ f8 ] \grg f8 [ c8 ] \grg f4 \bar "|"
+ \grg d8 [ c8 ] \thrwd d8. [ c16 ] \grg b8 [ f8 ] \bar "|"
+ \grg e16 [ f16 g8 ] \dblA A4 A4 \bar ":|:" \break
+
+ A2. \bar "|"
+ \dblf f8 [ d8 ] \dblg g8 [ A8 ] \grf g8 [ A8 ] \bar "|"
+ e4 \thrwd d4 \grg d8 [ c8 ] \bar "|"
+ \grg b8 [ f8 ] \grg e16. [ d32 ] d32 ] \grg e4 \bar "|" \break
+
+ A2. \bar "|"
+ \dblf f8 [ d8 ] \dblg g8 [ A8 ] \grf g8 [ A8 ] \bar "|"
+ e4 \thrwd d4 \grg d8 [ f8 ] \bar "|"
+ \grg e16 [ f16 g8 ] \dblA A4 A4 \bar ":|" \break
+
+			}
+
+\score {
+	\melody
+	\layout {
+	indent = 0.0\cm
+	\context { \Score \remove "Bar_number_engraver" }
+	}
+	\header {
+	title = "Balmoral"
+	meter = "Retreat"
+	arranger = "Arr. G. Rooney/The Seaforth Highlanders of Holland"
+	}
+	
+}
+
diff --git a/music/3-4_marches/collins_cattle/config.ily b/music/3-4_marches/collins_cattle/config.ily
new file mode 100644
index 0000000..7db0385
--- /dev/null
+++ b/music/3-4_marches/collins_cattle/config.ily
@@ -0,0 +1,13 @@
+\version "2.19.0"
+%% Globals
+global = {
+	\time 3/4
+	}
+%% Format
+part = { \partial 8 s8 }
+halfline = { \repeat unfold 4 { s2.| } }
+line = { \repeat unfold 2 { \halfline } }
+
+%% Headers
+title = "Collin's Cattle"
+meter = "Retreat"
diff --git a/music/3-4_marches/collins_cattle/notes.pipes.ily b/music/3-4_marches/collins_cattle/notes.pipes.ily
new file mode 100644
index 0000000..f67ec70
--- /dev/null
+++ b/music/3-4_marches/collins_cattle/notes.pipes.ily
@@ -0,0 +1,30 @@
+% 3/4 Collins Cattle
+% Pipes
+\version "2.18.2"
+composerPipes = ""
+pipeglobal = {
+	\bagpipeKey
+	}
+pipesA = {
+	\grg a8. [ b16 ] \grip c4 \dblc c4 |
+	\dble e4 \dblc c8 [ b8 ] \grG a4 |
+	\grg a8. [ b16 ] \grip c4 \dble e4 |
+	\dblA A4 \hdblf f2 |
+
+	\dble e8. [ d16 ] \grg c4 \dble e4 |
+	\dblc c8 [ \gre a8 ] \grg b4 \grip c4 |
+	\dblA A8. [ f16 ] \dble e4 \dblc c8 [ \gre a8 ] |
+	\dblb b4 \grG a2 
+}
+pipesB = {
+	\grg c8. [ d16 ] \dble e4 \gra e4 |
+	\dblA A4 \hdblf f4 \grg e4 |
+	\grg c8. [ d16 ] \dble e4 \grg f4 |
+	A4 \grg A2 |
+
+	a8. [ b16 ] \grip c4 \dblb b4 |
+	\grG a4 \grg b4 \grip c4 |
+	\dblA A8. [ f16 ] \dble e4 \dblc c8 [ \gre a8 ] |
+	\dblb b4 \grG a2 
+}
+
diff --git a/music/3-4_marches/collins_cattle/pipes.ly b/music/3-4_marches/collins_cattle/pipes.ly
new file mode 100644
index 0000000..42166b6
--- /dev/null
+++ b/music/3-4_marches/collins_cattle/pipes.ly
@@ -0,0 +1,28 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			{
+				\repeat volta 2 { \line }
+				\break
+				\repeat volta 2 { \line }
+			}
+			{
+				\pipesA
+				\pipesB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/music/3-4_marches/on_the_road_to_passchendaele/config.ily b/music/3-4_marches/on_the_road_to_passchendaele/config.ily
index 1eab0ad..9672755 100644
--- a/music/3-4_marches/on_the_road_to_passchendaele/config.ily
+++ b/music/3-4_marches/on_the_road_to_passchendaele/config.ily
@@ -2,7 +2,6 @@
 %% Globals
 global = {
 	\time 3/4
-	\eighthBeaming
 	}
 
 %% Format
@@ -17,4 +16,4 @@ meter = "Retreat"
 composerSide  = ""
 composerTenor = ""
 composerBass  = ""
-composerPipes = ""
\ No newline at end of file
+composerPipes = ""
diff --git a/music/3-4_marches/on_the_road_to_passchendaele/full.ly b/music/3-4_marches/on_the_road_to_passchendaele/full.ly
new file mode 100644
index 0000000..dc13991
--- /dev/null
+++ b/music/3-4_marches/on_the_road_to_passchendaele/full.ly
@@ -0,0 +1,79 @@
+\version "2.19.0"
+
+\include "config.ily"
+%\include "notes.bass.ily"
+%\include "notes.tenor.ily"
+\include "notes.side.ily"
+\include "notes.pipes.ily"
+
+\score {
+	\new StaffGroup <<
+		\new Staff {
+			\global
+			\pipeglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
+			<<
+				{
+					\repeat volta 2 { \line }
+					\break
+					\repeat volta 2 { \halfline }
+					\alternative {
+						{\halfline}
+						{\halfline}
+					}
+					\bar "|."
+					%\line \bar "||" \break
+					%\line \bar "|."
+				}%Format
+				{
+				\pipesA
+				
+				\pipesB
+				\pipesBA
+				\pipesBB
+				}%Pipes
+			>>
+		}
+		\new PipeBandDrumStaff = "side" {
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+
+			\snareAA
+			\snareAB
+
+			\snareBA
+			\snareBB
+			\snareAB
+		}
+%		\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 }
+%
+%		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup \large {
+			\column \right-align {
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
+				$(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=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}
diff --git a/music/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily b/music/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily
new file mode 100644
index 0000000..9f13b72
--- /dev/null
+++ b/music/3-4_marches/on_the_road_to_passchendaele/notes.pipes.ily
@@ -0,0 +1,38 @@
+% 3/4 On the Road to Passchendaele
+% Pipes
+\version "2.18.2"
+composerPipes = "PM Gavin Stoddart MBE BEM / Alan Brydon"
+pipeglobal = {
+	\bagpipeKey
+	}
+pipesA = {
+	\grg a8. [ b16 ] \grip c4~ c8 [ \grG c8 ] |
+	\grg d8 [ f8 ] \dble e4 c4 |
+	\grg a8. [ b16 ] \grip c4~ c8 [ e8 ] |
+	\grg f8 [ ( e8 c8 ] ) \grg b2  |
+
+	\grg a8. [ b16 ] \grip c4~ c8 [ \grG c8 ] |
+	\grg d8 [ f8 ] \dble e4 c4 |
+	\grg a8. [ b16 ] \grip c4~ c8 [ e8 ] |
+	\dbld d4 \rodin a2 
+}
+
+pipesB = {
+	\grg f8. [ g16 ] \dblA A4~ A8 [ g8 ] |
+	\grA f8 [ A8 ] \hdble e4 \grd c4 |
+	\grg a8. [ b16 ] \grip c4~ c8 [ f8 ] |
+	\dble e8 [ ( d8 c8 ] ) \grg b2 
+}
+
+pipesBA = {
+	\grg f8. [ g16 ] \dblA A4~ A8 [ g8 ] |
+	\dblf f8 [ A8 ] \dble e4 c4 |
+	\grg a8. [ b16 ] \grip c4~ c8 [ e8 ] |
+	\dbld d4 \rodin a2 
+}
+pipesBB = {
+	\grg a8. [ b16 ] \grip c4~ c8 [ \grG c8 ] |
+	\grg d8 [ f8 ] \dble e4 \grd c4 |
+	\grg a8. [ b16 ] \grip c4~ c8 [ e8 ] |
+	\dbld d4 \rodin a2 
+}
diff --git a/music/3-4_marches/on_the_road_to_passchendaele/notes.side.ily b/music/3-4_marches/on_the_road_to_passchendaele/notes.side.ily
index 2dc6ba8..ca71a6f 100644
--- a/music/3-4_marches/on_the_road_to_passchendaele/notes.side.ily
+++ b/music/3-4_marches/on_the_road_to_passchendaele/notes.side.ily
@@ -2,7 +2,9 @@
 % Snare
 \version "2.18.2"
 composerSide = ""
-
+sideglobal = {
+	\eighthBeaming
+	}
 %%music
 snareAA = \drummode {
 	\flamd d8. g16		d4:32(		d8) d8:32( |
@@ -32,4 +34,4 @@ snareBB = \drummode {
 
 	\flamd d8. g16		d4:32(		d8:32)(-> \tuplet 3/2 { g16) d g } |
 	d16. d32 \flamg g8		d4:32(		d4)
-}
\ No newline at end of file
+}
diff --git a/music/3-4_marches/on_the_road_to_passchendaele/pipes.ly b/music/3-4_marches/on_the_road_to_passchendaele/pipes.ly
new file mode 100644
index 0000000..649ec1c
--- /dev/null
+++ b/music/3-4_marches/on_the_road_to_passchendaele/pipes.ly
@@ -0,0 +1,36 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			{
+				\repeat volta 2 { \line }
+				\break
+				\repeat volta 2 { \halfline}
+				\alternative {
+					{\halfline}
+					{\halfline}
+				}
+				\bar "|."
+			}
+			{
+				\pipesA 
+
+				\pipesB
+				\pipesBA
+				\pipesBB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/music/3-4_marches/on_the_road_to_passchendaele/side.ly b/music/3-4_marches/on_the_road_to_passchendaele/side.ly
index 6c6e7dc..2d2bcd2 100644
--- a/music/3-4_marches/on_the_road_to_passchendaele/side.ly
+++ b/music/3-4_marches/on_the_road_to_passchendaele/side.ly
@@ -6,11 +6,19 @@
 \score {
     \new PipeBandDrumStaff {
         \global
+	\sideglobal
         <<
 			{
-				\repeat volta 2 { \line } \break
-				\line \bar "||" \break
-				\line \bar "|."
+				\repeat volta 2 { \line }
+				\break
+				\repeat volta 2 { \halfline }
+				\alternative {
+					{\halfline}
+					{\halfline}
+				}
+				\bar "|."
+				%\line \bar "||" \break
+				%\line \bar "|."
 			}
 			{
 			 \snareAA
@@ -18,8 +26,6 @@
 
 			 \snareBA
 			 \snareBB
-
-			 \snareBA
 			 \snareAB
 			}
 		>>
@@ -30,4 +36,4 @@
 		instrument = \instrumentSide
 		composer = \composerSide
 	}
-}
\ No newline at end of file
+}
diff --git a/music/3-4_marches/red_hackle/config.ily b/music/3-4_marches/red_hackle/config.ily
new file mode 100644
index 0000000..4e7156b
--- /dev/null
+++ b/music/3-4_marches/red_hackle/config.ily
@@ -0,0 +1,13 @@
+\version "2.19.0"
+%% Globals
+global = {
+	\time 3/4
+	}
+%% Format
+part = { \partial 8 s8 }
+halfline = { \repeat unfold 4 { s2. | } }
+line = { \repeat unfold 2 { \halfline } }
+
+%% Headers
+title = "Red Hackle"
+meter = "Retreat"
diff --git a/music/3-4_marches/red_hackle/notes.pipes.ily b/music/3-4_marches/red_hackle/notes.pipes.ily
new file mode 100644
index 0000000..38a75c8
--- /dev/null
+++ b/music/3-4_marches/red_hackle/notes.pipes.ily
@@ -0,0 +1,29 @@
+% <<TimeSig>> <<Title>>
+% Pipes
+\version "2.18.2"
+composerPipes = ""
+pipeglobal = {
+	\bagpipeKey
+	}
+pipesA = {
+	\grg a8. [ c16 ] \grg e4 \dblc c8 [ \gre a8 ] \bar "|"
+	\thrwd d8 [ f8 ] \dblf f4 \grg e4 \bar "|"
+	\grg c8. [ d16 ] \dble e4 \dblc c8 [ e8 ] \bar "|"
+	\thrwd d8. [ c16 ] \dblb b2 \bar "|" \break
+
+	\grg a8. [ c16 ] \grg e4 \dblc c8 [ \gre a8 ] \bar "|"
+	\thrwd d8 [ f8 ] \dblf f4 \grg e4 \bar "|"
+	\grg c8. [ d16 ] \dble e4 \dblc c8 [ e8 ] \bar "|"
+	\thrwd d8. [ b16 ] \grG a2 
+}
+pipesB = {
+	A8 [ c8 ] \grip c4 \grg a8 [ \grd c8 ] \bar "|"
+	\thrwd d8 [ f8 ] \dblf f4 \grg e4 \bar "|"
+	A8 [ c8 ] \grip c4 \grg a8 [ f8 ] \bar "|"
+	\grg e8. [ d16 ] \dblb b2 \bar "|" \break
+
+	A8 [ c8 ] \grip c4 \grg a8 [ \grd c8 ] \bar "|"
+	\thrwd d8 [ f8 ] \dblf f4 \grg e4 \bar "|"
+	\grg c8. [ d16 ] \dble e4 \dblc c8 [ e8 ] \bar "|"
+	\thrwd d8. [ b16 ] \grG a2 
+}
diff --git a/music/3-4_marches/red_hackle/pipes.ly b/music/3-4_marches/red_hackle/pipes.ly
new file mode 100644
index 0000000..2703f1d
--- /dev/null
+++ b/music/3-4_marches/red_hackle/pipes.ly
@@ -0,0 +1,29 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			{
+				\repeat volta 2 {\line }
+				\break
+				\repeat volta 2 {\line }
+			}
+			{
+				\pipesA
+				
+				\pipesB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/music/3-4_marches/shoals_of_herring/config.ily b/music/3-4_marches/shoals_of_herring/config.ily
new file mode 100644
index 0000000..e21854d
--- /dev/null
+++ b/music/3-4_marches/shoals_of_herring/config.ily
@@ -0,0 +1,13 @@
+\version "2.19.0"
+%% Globals
+global = {
+	\time 3/4
+	}
+%% Format
+part = { \partial 8 s8 }
+halfline = { \repeat unfold 4 { s2. | } }
+line = { \repeat unfold 2 { \halfline } }
+
+%% Headers
+title = "Shoals of Herring"
+meter = "Retreat"
diff --git a/music/3-4_marches/shoals_of_herring/notes.pipes.ily b/music/3-4_marches/shoals_of_herring/notes.pipes.ily
new file mode 100644
index 0000000..173555c
--- /dev/null
+++ b/music/3-4_marches/shoals_of_herring/notes.pipes.ily
@@ -0,0 +1,32 @@
+% <<TimeSig>> <<Title>>
+% Pipes
+\version "2.18.2"
+composerPipes = ""
+pipeglobal = {
+	\bagpipeKey
+	}
+pipesA = {
+	\grg a8. [ c16 ] \dble e4 \dblc c8 [ e8 ] \bar "|"
+	\grg f8 [ A8 ] \hdblf f8. [ e16 ] \dblc c4 \bar "|"
+	\grg a8. [ c16 ] \dble e4 \dblc c8 [ e8 ] \bar "|"
+	\dblA A8 [ c8 ] \dblc c4 \gre b4 
+}
+pipesAB = {
+	\grg a8. [ c16 ] \dble e4 \dblc c8 [ e8 ] \bar "|"
+	\grg f8 [ A8 ] \hdblf f8. [ e16 ] \dblc c4 \bar "|"
+	\grg a8. [ c16 ] \dble e4 \dblc c8 [ \gre a8 ] \bar "|"
+	\thrwd d8. [ c16 ] \dblb b4 \grG a4 
+}
+
+pipesB = {
+	A8. [ g16 ] \grA f4 A8. [ g16 ] \bar "|"
+	\grA f8 [ A8 ] \hdblf f8. [ e16 ] \dblc c4 \bar "|"
+	A8. [ f16 ] \dble e4 \dblc c8 [ e8 ] \bar "|"
+	\dblA A8 [ c8 ] \dblc c4 \gre b4 \bar "|" \break
+}
+pipesBA = {
+	A8. [ g16 ] \grA f4 A8. [ g16 ] \bar "|"
+	\grA f8 [ A8 ] \hdblf f8. [ e16 ] \dblc c4 \bar "|"
+	a8. [ c16 ] \dble e4 \dblc c8 [ \gre a8 ] \bar "|"
+	\thrwd d8. [ c16 ] \dblb b4 \grG a4 
+}
diff --git a/music/3-4_marches/shoals_of_herring/pipes.ly b/music/3-4_marches/shoals_of_herring/pipes.ly
new file mode 100644
index 0000000..af9c50b
--- /dev/null
+++ b/music/3-4_marches/shoals_of_herring/pipes.ly
@@ -0,0 +1,37 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			{
+				\repeat volta 2 {\line}
+				\break
+				\repeat volta 2 {\halfline}
+				\alternative {
+					{\halfline}
+					{\halfline}
+				}
+				\bar "|." 
+			}
+			{
+			\pipesA
+			\pipesAB
+			
+			\pipesB
+			\pipesBA
+			\pipesAB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/music/4-4_marches/the_leaving_of_liverpool/config.ily b/music/4-4_marches/the_leaving_of_liverpool/config.ily
index da97336..2045388 100644
--- a/music/4-4_marches/the_leaving_of_liverpool/config.ily
+++ b/music/4-4_marches/the_leaving_of_liverpool/config.ily
@@ -2,7 +2,6 @@
 %% Globals
 global = {
 	\time 4/4
-	\eighthBeaming
 	}
 
 %% Format
@@ -12,4 +11,4 @@ line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
 title = "The Leaving of Liverpool"
-meter = "March"
\ No newline at end of file
+meter = "March"
diff --git a/music/4-4_marches/the_leaving_of_liverpool/full.ly b/music/4-4_marches/the_leaving_of_liverpool/full.ly
new file mode 100644
index 0000000..8728cdf
--- /dev/null
+++ b/music/4-4_marches/the_leaving_of_liverpool/full.ly
@@ -0,0 +1,58 @@
+\version "2.19.0"
+
+\include "config.ily"
+\include "notes.bass.ily"
+\include "notes.tenor.ily"
+\include "notes.side.ily"
+\include "notes.pipes.ily"
+
+\score {
+	\new StaffGroup <<
+		\new Staff {
+			\global
+			\pipeglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
+			<<
+				{}%Format
+				{}%Pipes
+			>>
+		}
+		\new PipeBandDrumStaff = "side" {
+			\sideglobal
+			\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
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+
+		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup \large {
+			\column \right-align {
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
+				$(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=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}
diff --git a/music/4-4_marches/the_leaving_of_liverpool/leav.ly b/music/4-4_marches/the_leaving_of_liverpool/leav.ly
new file mode 100644
index 0000000..29529fa
--- /dev/null
+++ b/music/4-4_marches/the_leaving_of_liverpool/leav.ly
@@ -0,0 +1,55 @@
+\include "bagpipe.ly"
+melody = {
+		\set Staff.midiInstrument = #"bagpipe"
+		\hideKeySignature
+		\cadenzaOn
+		\once \override Score.BreakAlignment #'break-align-orders =
+			#(make-vector 3 '(instrument-name
+									left-edge
+									ambitus
+									span-bar
+									breathing-sign
+									clef
+									key-signature
+									time-signature
+									staff-bar
+									custos
+									span-bar))
+		\time 4/4
+		\grg a8. [ b16 ] \bar "|"
+ \grip c4 \dblc c8 [ e8 ] \thrwd d8 [ c8 ] \dblb b8 [ a8 ] \bar "|"
+ A4 \grg A8. [ f16 ] \grg e4 \grg a8. [ b16 ] \bar "|"
+ \grip c8 [ e8 ] \dble e8 [ c8 ] \grg f8. [ e16 ] \thrwd d8 [ c8 ] \bar "|"
+ \dblb b2 \grip b4 \grg a8. [ b16 ] \bar "|" \break
+
+ \grip c4 \dblc c8 [ e8 ] \thrwd d8 [ c8 ] \dblb b8 [ a8 ] \bar "|"
+ A4 \grg A8. [ f16 ] \grg e4 \grg a8. [ b16 ] \bar "|"
+ \grip c8 [ e8 ] \dble e8 [ c8 ] \dblb b4~ \grG a8 \bar "|"
+ \grg a2 \wbirl a4 \bar ".|" \break 
+ \grg f8. [ g16 ] \bar "|"
+ \dblA A4 A8. [ f16 ] \grg e4. \gra e8 \bar "|"
+ \grg f8 [ d8 ] A8. [ f16 ] \grg e4 \grg a8. [ b16 ] \bar "|"
+ \grip c8 [ e8 ] \dble e8 [ c8 ] \grg f8. [ e16 ] \thrwd d8 [ c8 ] \bar "|"
+ \dblb b2 \grip b4 \grg f8. [ g16 ] \bar "|" \break
+
+ \dblA A4 A8. [ f16 ] \grg e4. \gra e8 \bar "|"
+ \grg f8 [ d8 ] A8. [ f16 ] \grg e4 \grg a8. [ b16 ] \bar "|"
+ \grip c8 [ e8 ] \dble e8 [ c8 ] \dblb b4. \grG a8 \bar "|"
+ \grg a2 \wbirl a4 \bar ".|" \break 
+
+			}
+
+\score {
+	\melody
+	\layout {
+	indent = 0.0\cm
+	\context { \Score \remove "Bar_number_engraver" }
+	}
+	\header {
+	title = "  set 12"
+	meter = "March"
+	arranger = ""
+	}
+	
+}
+
diff --git a/music/4-4_marches/the_leaving_of_liverpool/notes.pipes.ily b/music/4-4_marches/the_leaving_of_liverpool/notes.pipes.ily
new file mode 100644
index 0000000..8b4705e
--- /dev/null
+++ b/music/4-4_marches/the_leaving_of_liverpool/notes.pipes.ily
@@ -0,0 +1,35 @@
+% 4/4s The Leaving of Liverpool
+% Pipes
+\version "2.18.2"
+composerPipes = ""
+pipeglobal = {
+	\bagpipeKey
+	}
+pipesAA = {
+	\grg a8. [ b16 ] 
+	\grip c4 \dblc c8 [ e8 ] \thrwd d8 [ c8 ] \dblb b8 [ a8 ] |
+	A4 \grg A8. [ f16 ] \grg e4 \grg a8. [ b16 ] |
+	\grip c8 [ e8 ] \dble e8 [ c8 ] \grg f8. [ e16 ] \thrwd d8 [ c8 ] |
+	\dblb b2 \grip b4 \grg a8. [ b16 ] |
+}
+pipesAB = {
+	\grip c4 \dblc c8 [ e8 ] \thrwd d8 [ c8 ] \dblb b8 [ a8 ] |
+	A4 \grg A8. [ f16 ] \grg e4 \grg a8. [ b16 ] |
+	\grip c8 [ e8 ] \dble e8 [ c8 ] \dblb b4~ \grG a8 |
+	\grg a2 \wbirl a4 
+}
+
+pipesBA = {
+	\grg f8. [ g16 ] |
+	\dblA A4 A8. [ f16 ] \grg e4. \gra e8  |
+	\grg f8 [ d8 ] A8. [ f16 ] \grg e4 \grg a8. [ b16 ]  |
+	\grip c8 [ e8 ] \dble e8 [ c8 ] \grg f8. [ e16 ] \thrwd d8 [ c8 ] |
+	\dblb b2 \grip b4 \grg f8. [ g16 ] |
+}
+
+pipesBB = {
+	\dblA A4 A8. [ f16 ] \grg e4. \gra e8 |
+	\grg f8 [ d8 ] A8. [ f16 ] \grg e4 \grg a8. [ b16 ] |
+	\grip c8 [ e8 ] \dble e8 [ c8 ] \dblb b4. \grG a8 |
+	\grg a2 \wbirl a4 
+}
diff --git a/music/4-4_marches/the_leaving_of_liverpool/pipes.ly b/music/4-4_marches/the_leaving_of_liverpool/pipes.ly
new file mode 100644
index 0000000..d05cd1a
--- /dev/null
+++ b/music/4-4_marches/the_leaving_of_liverpool/pipes.ly
@@ -0,0 +1,35 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			{
+				\repeat unfold 2 {
+					\part
+					\line
+					\break
+					\line
+					\break
+				}
+			
+			}
+			{
+				\pipesAA
+				\pipesAB s4 
+
+				\pipesBA
+				\pipesBB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/music/4-4_marches/the_pikemans_march/bass.ly b/music/4-4_marches/the_pikemans_march/bass.ly
new file mode 100644
index 0000000..21e33a1
--- /dev/null
+++ b/music/4-4_marches/the_pikemans_march/bass.ly
@@ -0,0 +1,33 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.bass.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+        \global
+		\bassglobal
+		<<
+			{\repeat volta 2 { \line \break \line} 
+				\break
+				\line \break
+				\line \break
+				\line \bar "|."
+			}
+			{
+				\bassAA
+				\bassAB
+			
+				\bassBA 
+				\bassBB
+				\bassBB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentBass
+		composer = \composerBass
+	}
+}
diff --git a/music/4-4_marches/the_pikemans_march/drums.ly b/music/4-4_marches/the_pikemans_march/drums.ly
index a68bdc2..4868c6f 100644
--- a/music/4-4_marches/the_pikemans_march/drums.ly
+++ b/music/4-4_marches/the_pikemans_march/drums.ly
@@ -1,19 +1,20 @@
 \version "2.19.0"
 
 \include "config.ily"
-%\include "notes.bass.ily"
+\include "notes.bass.ily"
 \include "notes.tenor.ily"
-\include "notes.side.v1.6.ily"
+\include "notes.side.v1.8.ily"
 
 \score {
 	\new StaffGroup <<
 		\new PipeBandDrumStaff = "side" {
 			\global
+			\sideglobal
 			\set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide}
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
 			<<
-				{ \repeat volta 2 { \part \line \break \line} \break
+				{ \repeat volta 2 { \part \line \break \line} \pageBreak
 					\part \line \break
 					\line \break
 					\line \bar "|."
@@ -28,13 +29,17 @@
 				}
 			>>
 		}
-		%\new PipeBandDrumStaff = "bass" {
-		%	\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-		%	\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
-        %
-		%	\bassA
-		%	s16 \bassBA \bassBB
-		%}
+		\new PipeBandDrumStaff = "bass" {
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+        
+			s8 \bassAA
+			\bassAB
+			
+			s8 \bassBA 
+			\bassBB
+			\bassBB
+		}
 		\new PipeBandDrumStaff = "tenor" {
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
@@ -43,7 +48,6 @@
 			\tenorAB
 			s8
 
-			s8
 			\tenorBA
 			\tenorBB
 			\tenorBC
@@ -65,4 +69,4 @@
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/music/4-4_marches/the_pikemans_march/notes.bass.ily b/music/4-4_marches/the_pikemans_march/notes.bass.ily
new file mode 100644
index 0000000..b597be1
--- /dev/null
+++ b/music/4-4_marches/the_pikemans_march/notes.bass.ily
@@ -0,0 +1,60 @@
+% 4/4 The Pikeman's March
+% Bass
+\version "2.18.2"
+composerBass  = "E.T. de Boone, v0.1, 2016"
+bassglobal = {}
+bassAA = \drummode {
+	d4
+	g4
+	r8 d8
+	g4
+	|
+	d4
+	g4
+	d8[ g]
+	d4
+	|
+	d4
+	g4
+	d4
+	g4
+	|
+	d4
+	g4
+	d4
+	r4
+}
+
+bassAB = \drummode {
+	d4
+	g4
+	r8 d8
+	g4
+	|
+	d4
+	g4
+	d8[ g]
+	d4
+	|
+	d4
+	r4
+	d4
+	r8 g8
+	|
+	d4
+	r8 g8
+	d4
+	r4
+}
+
+bassBA = \drummode {
+	r1*4
+}
+bassBB = \drummode {
+	d8 g8
+	r4
+	d4
+	g4
+	|
+	r1*3
+}
diff --git a/music/4-4_marches/the_pikemans_march/notes.side.ily b/music/4-4_marches/the_pikemans_march/notes.side.ily
index 23e4242..9cfc63f 100644
--- a/music/4-4_marches/the_pikemans_march/notes.side.ily
+++ b/music/4-4_marches/the_pikemans_march/notes.side.ily
@@ -2,6 +2,9 @@
 % Side
 \version "2.18.2"
 composerSide = "E.T. de Boone, 2014"
+sideglobal = {
+	\eighthBeaming
+	}
 
 %%music
 snareAA = \drummode {
@@ -36,4 +39,4 @@ snareBC = \drummode {
 	g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) d16. g32 |
 	d8.:32(-> g16:64)(->		d8:32)(-> g8)->		d32 g d g d16.-> g32->		d32 g d g d8-> |
 	\flamd d4		d8:32( g8:32)(->		d4)		r4
-}
\ No newline at end of file
+}
diff --git a/music/4-4_marches/the_pikemans_march/notes.side.v1.5.ily b/music/4-4_marches/the_pikemans_march/notes.side.v1.5.ily
index 4671802..3b70bc7 100644
--- a/music/4-4_marches/the_pikemans_march/notes.side.v1.5.ily
+++ b/music/4-4_marches/the_pikemans_march/notes.side.v1.5.ily
@@ -2,7 +2,9 @@
 % Side
 \version "2.18.2"
 composerSide = "E.T. de Boone, v1.5, 2015"
-
+sideglobal = {
+	\eighthBeaming
+	}
 %%music
 snareAA = \drummode {
 	g16. g32 |
@@ -36,4 +38,4 @@ snareBC = \drummode {
 	g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) d16. g32 |
 	d8.:32(-> g16:64)(->		d8:32)(-> g8)->		d32 g d g d16.-> g32->		d32 g d g d8-> |
 	\flamd d4		d8:32( g8:32)(->		d4)		r4
-}
\ No newline at end of file
+}
diff --git a/music/4-4_marches/the_pikemans_march/notes.side.v1.6.ily b/music/4-4_marches/the_pikemans_march/notes.side.v1.6.ily
index eafdf43..1c6c12c 100644
--- a/music/4-4_marches/the_pikemans_march/notes.side.v1.6.ily
+++ b/music/4-4_marches/the_pikemans_march/notes.side.v1.6.ily
@@ -2,7 +2,9 @@
 % Side
 \version "2.18.2"
 composerSide = "E.T. de Boone, v1.6, 2015"
-
+sideglobal = {
+	\eighthBeaming
+	}
 %%music
 snareAA = \drummode {
 	g16. g32 |
@@ -36,4 +38,4 @@ snareBC = \drummode {
 	g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8) d16. g32 |
 	d8.:32(-> g16:64)(->		d8:32)(-> g8)->		d32 g d g d16.-> g32->		d32 g d g d8-> |
 	\flamd d4		d8:32( g8:32)(->		d4)		r4
-}
\ No newline at end of file
+}
diff --git a/music/4-4_marches/the_pikemans_march/notes.side.v1.7.ily b/music/4-4_marches/the_pikemans_march/notes.side.v1.7.ily
new file mode 100644
index 0000000..6d05270
--- /dev/null
+++ b/music/4-4_marches/the_pikemans_march/notes.side.v1.7.ily
@@ -0,0 +1,47 @@
+% 4/4 The Pikeman's March
+% Side
+\version "2.18.2"
+composerSide = "E.T. de Boone, v1.7, 2016"
+sideglobal = {
+	\eighthBeaming
+	}
+
+%%music
+snareAA = \drummode {
+	g16. g32 |
+	\flamd d4\v		d32\< g d g d8->\!		\flamd d8\> \flamg g8\!		r8 d8:32( |
+	g16.) d32-> g16. g32		d16. g32-> d16. d32		\flamg g8 d8:32(		g8..) g32 |
+
+	\flamd d4		\flamd d16 g-> d d		\flamg g16 d-> g g		\flamd d16 g-> d d |
+	\flamd d4		d8:32( g8:32)(->		d4)		r8 \tuplet 3/2 { g16\< d g\! } |
+}
+snareAB = \drummode {
+	\flamd d4\v		d32\< g d g d8->\!		\flamd d8\> \flamg g8\!		r8 d8:32( |
+	\tuplet 3/2 { g16) d g } \flamd d16. g32		\tuplet 3/2 { d16 g d } \flamg g16. g32		\flamd d16. g32 d32 g d g		d8-> g16. g32 |
+
+	d8:32( g8:32)(->		d8:32)( g8:32)(->		d8)-> \tuplet 3/2 { g16 d g}	\flam d8 g32 d d g	|
+	\flam d8. g16	d8:32(-> g8:32)(->  		d8.)-> d16:64(		d8)
+}
+snareBA = \drummode {
+	d16. g32 |
+	\drag d8 d16. g32	\drag g16. d32:128( d16.) g32->		r16. \drag d32 g16. g32		d4:32( \< |
+	d16.)\! g32 \flam d16. g32	d16. g32-> d32 g d g		\flam g8 d8:32(		g16:64 g16) d8 |
+	
+	d8:32( g8:32)(->		d8:32)( g8:32)(->		d8)-> d32 g d g		d8-> d16. g32	|
+	\flamd d4		d8:32( g8:32)(->		d4)		\flamd d16 \p g \flamg g d |
+}
+snareBB = \drummode {
+	\flamd d8\f \flamg g8		r8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8:32( |
+	d16.)\! g32 \flam d16. g32	d16. g32-> d32 g d g		\flam g8 d8:32(		g16:64 g16) d16. g32 |
+
+	d8.:32(-> g16:64)(->		d8:32)(-> g8)->		\flamd d16.\> g32-> d16. d32\!		\flamg g16.\> d32-> g16. g32\! |
+	\flamd d4		d4:32(		d4)		r8 d16. g32 |
+}
+
+snareBC = \drummode {
+	\flamd d8\f \flamg g8		r8 d8:32(		g16.) d32-> g16. g32		\flamd d8 d8:32( |
+	d16.)\! g32 \flam d16. g32	d16. g32-> d32 g d g		\flam g8 d8:32(		g16:64 g16) d16. g32 |
+
+	d8.:32(-> g16:64)(->		d8:32)(-> g16.)-> g32->		d32 g d g d16.-> g32->		d32 g d g d8-> |
+	\flamd d4		d8:32( g8:32)(->		d4)		r4
+}
diff --git a/music/4-4_marches/the_pikemans_march/notes.side.v1.8.ily b/music/4-4_marches/the_pikemans_march/notes.side.v1.8.ily
new file mode 100644
index 0000000..e6a6426
--- /dev/null
+++ b/music/4-4_marches/the_pikemans_march/notes.side.v1.8.ily
@@ -0,0 +1,116 @@
+% 4/4 The Pikeman's March
+% Side
+\version "2.18.2"
+composerSide = "E.T. de Boone, v1.8, 2016"
+sideglobal = {
+	\eighthBeaming
+	}
+
+%%music
+snareAA = \drummode {
+	g16. \dr g32
+	|
+	\flamd d4\v \fr
+	d32\< g d g d8->\!
+	\flamddr d8\> \flamg g8\!
+	r8 d8:32(
+	|
+	g16.) d32-> g16. g32
+	d16. g32-> d16. d32
+	\flamg g8 d8:32(
+	g8..) \fr g32
+	|
+
+	\flamd d4
+	\flamd d16 g-> d d
+	\flamg g16 d-> g g
+	\flamd d16 g-> d d
+	|
+	\flamddr d4
+	d8:32( g8:32)(->
+	d4)
+	r8 \tuplet 3/2 { g16\< d g\! }
+}
+snareAB = \drummode {
+	\flamd d4\v \fr
+	d32\< g d g d8->\!
+	\flamddr d8\> \flamg g8\!
+	r8 d8:32(
+	|
+	\tuplet 3/2 { g16) d g } \flamd d16. g32
+	\tuplet 3/2 { d16 g d } \flamg g16.  g32
+	\flamd d16.\fr g32 d32 g d g
+	d8-> g16. \dr g32
+	|
+
+	d8:32( g8:32)(->
+	d8:32)( g8:32)(->
+	d8)->\fr \tuplet 3/2 { g16 d g}	\flam d8 g32\dr d d g
+	|
+	\flam d8. g16	d8:32(-> g8:32)(->  
+	d8.)->\fr d16:64(
+	d8)
+}
+snareBA = \drummode {
+	d16. g32
+	|
+	\flam d8 d16. g32	\flam d16. d32:128( d16.) g32->
+	r16. \flam d32 g16. g32
+	d4:32( \dr \<
+	|
+	d16.)\! g32 \flam d16. g32	d16. g32-> d32 g d g
+	\flam g8 \fr d8:32(
+	g16:64 g16) d8 \dr
+	|
+	
+	d8:32( g8:32)(->
+	d8:32)( g8:32)(->
+	d8)->\fr d32 g d g
+	d8-> d16. \dr g32
+	|
+	\flamd d4
+	d8:32( g8:32)(->
+	d4)	\fr	\tuplet 6/4 {d16 \< g d g16 d g\! }
+}
+snareBB = \drummode {
+	\flamd d8\f \flamg g8
+	r8 d8:32(
+	g16.) d32-> g16. g32
+	\flamd d8 d8:32(\dr
+	|
+	g16.)\! g32 \flam d16. g32	d16. g32-> d32 g d g
+	\flam g8 \fr d8:32(
+	g16:64 g16) d16. g32
+	|
+	
+	d8.:32(->\dr g16:64)(->
+	d8:32)(-> g8)->\fr
+	\flamd d16.\> g32-> d16. d32\!
+	\flamg g16.\> d32-> g16. g32\!
+	|
+	\flamddr d4
+	d4:32(
+	d8) \fr	\flam g8  r8  d16.\dr g32
+}
+
+snareBC = \drummode {
+	\flamd d8\f \flamg g8
+	r8 d8:32(
+	g16.) d32-> g16. g32
+	\flamd d8 d8:32(
+	|
+	g16.)\! g32 \flam d16. g32	d16. g32-> d32 g d g
+	\flam g8 d8:32(
+	g16:64 g16) d16. g32
+	|
+
+	d8.:32(-> g16:64)(->
+	d8:32)(-> g16.)-> g32->
+	d32 g d g d16.-> g32->
+	d32 g d g d8->
+	|
+	\flamd d4
+	d8:32( g8:32)(->
+	d4)
+	r4 
+}
diff --git a/music/4-4_marches/the_pikemans_march/notes.tenor.ily b/music/4-4_marches/the_pikemans_march/notes.tenor.ily
index 628086f..2f873e1 100644
--- a/music/4-4_marches/the_pikemans_march/notes.tenor.ily
+++ b/music/4-4_marches/the_pikemans_march/notes.tenor.ily
@@ -1,41 +1,93 @@
 % 4/4 The Pikeman's March
 % Tenor
 \version "2.18.2"
-composerTenor = "E.T. de Boone, v0.3, 2015"
-
+composerTenor = "E.T. de Boone, v0.8, 2016"
+tenorglobal = {
+	}
 %%music
 tenorAA = \drummode {
 	d16 \< g16 |
 	d4 \!		g8. d16		r8 d16 g	d4
 	|
-	d8 g		d8 g		d4			g4
+	d8[ g]		d8[ g]		d4			g4
 	|
 	d4->		r16 d16 r8	r16 g16 r8	r16 d r g
 	|
-	d4			d8^\markup{scoop} g	d4^\markup{end}	r8
+	d4		d8^\markup{scoop} g	d4^\markup{end}	r8
 }
 tenorAB = \drummode {
 	d16 \< g16 |
 	d4 \!		g8. d16		r8 d16 g	d4
 	|
-	d8 g		d8 g		d4			g4
+	d8[ g]		d8[ g]		d4		g4
 	|
 	d8 g		r8 g8		d8 g8		r4
 	|
-	d4			d8^\markup{scoop} g	d4^\markup{end}	r8
+	d4		d8^\markup{scoop} g	d4^\markup{end}	r8
 }
 % Part 2
 tenorBA = \drummode {
-	d8-_ g
-	d8 g
-	d8 g
+	d16 g16 |
+	d8 d16 g
 	d8 g
+	d4
+	r8. g16
 	|
-	s1*3
+	d8[ g]
+	d8[ g]
+	\flourish d4
+	\flourish g4
+	|
+	d4
+	r8 d16 g
+	d8[ g]
+	d4
+	|
+	d4
+	d8^\markup{scoop} g
+	d4^\markup{end}
+	d4^\splitTheFeather
+
 }
 tenorBB = \drummode {
-	s1*4
+	r4
+	d8 g
+	d8. g16
+	d4
+	|
+	d8[ g]
+	d8[ g]
+	d4
+	g4
+	|
+	d4
+	g8[ d]
+	\flourish g4
+	\flourish d4
+	|
+	d4
+	d8^\markup{scoop} g
+	d4^\markup{end}
+	d4^\splitTheFeather
 }
 tenorBC = \drummode {
-	s1*4
+	r4
+	d8 g
+	d8. g16
+	d4
+	|
+	d8[ g]
+	d8[ g]
+	d4
+	g4
+	|
+	d4
+	g8[ d]
+	\flourish g4
+	\flourish d4
+	|
+	d4
+	d8^\markup{scoop} g
+	d4^\markup{end}
+	r4
 }
diff --git a/music/4-4_marches/the_pikemans_march/side.ly b/music/4-4_marches/the_pikemans_march/side.ly
index 6aac954..b43c75d 100644
--- a/music/4-4_marches/the_pikemans_march/side.ly
+++ b/music/4-4_marches/the_pikemans_march/side.ly
@@ -1,11 +1,12 @@
 \version "2.18.2"
 
 \include "config.ily"
-\include "notes.side.v1.6.ily"
+\include "notes.side.v1.8.ily"
 
 \score {
     \new PipeBandDrumStaff {
         \global
+	\sideglobal
         <<
 			{\repeat volta 2 { \part \line \break \line} \break
 				\part \line \break
@@ -29,4 +30,4 @@
 		instrument = \instrumentSide
 		composer = \composerSide
 	}
-}
\ No newline at end of file
+}
diff --git a/music/4-4_marches/the_pikemans_march/tenor.ly b/music/4-4_marches/the_pikemans_march/tenor.ly
index 86e7e61..dfb1415 100644
--- a/music/4-4_marches/the_pikemans_march/tenor.ly
+++ b/music/4-4_marches/the_pikemans_march/tenor.ly
@@ -16,7 +16,6 @@
 			 \tenorAA
 			 \tenorAB
 
-			 s8
 			 \tenorBA
 			 \tenorBB
 			 \tenorBC
@@ -29,4 +28,4 @@
 		instrument = \instrumentTenor
 		composer = \composerTenor
 	}
-}
\ No newline at end of file
+}
diff --git a/music/hornpipes/the_walrus/Walrus The.ly b/music/hornpipes/the_walrus/Walrus The.ly
new file mode 100644
index 0000000..4d33939
--- /dev/null
+++ b/music/hornpipes/the_walrus/Walrus The.ly	
@@ -0,0 +1,95 @@
+\include "bagpipe.ly"
+melody = {
+		\set Staff.midiInstrument = #"bagpipe"
+		\hideKeySignature
+		\cadenzaOn
+		\once \override Score.BreakAlignment #'break-align-orders =
+			#(make-vector 3 '(instrument-name
+									left-edge
+									ambitus
+									span-bar
+									breathing-sign
+									clef
+									key-signature
+									time-signature
+									staff-bar
+									custos
+									span-bar))
+		\time 2/4
+		\bar "|:" \grg b16 [ d16 ] \bar "|"
+ \grg e8 [ a8 ] \grg b16 [ a16 \grg b16 d16 ] \bar "|"
+ \grg e16 [ g16 \grA f16 d16 ] \dble e8 [ \grg d16 b16 ] \bar "|"
+ \grg G16 [ d16 \grg d16 \slurc d16 ] \grg b16 [ a16 \grg b16 d16 ] \bar "|"
+ \dble e8 [ g16 e16 ] \grg d16 [ b16 \grg c16 d16 ] \bar "|" \break
+
+ \grg e8 [ a8 ] \grg b16 [ a16 \grg b16 d16 ] \bar "|"
+ \grg e16 [ g16 \grA f16 d16 ] \dble e8 [ \grg d16 b16 ] \bar "|"
+ \grg G16 [ \grd G16 \grg b16 d16 ] \grg e16 [ d16 \grg b16 \grd G16 ] \bar "|"
+ \grg a8 [ \wbirl a8 ] \grg a8 \bar ":|:" \break
+
+ \grg b16 [ d16 ] \bar "|"
+ \grg e8 [ A8 ] e8 [ \grg d16 b16 ] \bar "|"
+ \grg e16 [ g16 \grA f16 d16 ] \dble e8 [ \grg d16 b16 ] \bar "|"
+ \grg G16 [ d16 \grg d16 \slurc d16 ] \grg b16 [ a16 \grg b16 d16 ] \bar "|"
+ \dble e8 [ g16 e16 ] \grg d16 [ b16 \grg c16 d16 ] \bar "|" \break
+
+ \set Score.repeatCommands = #'((volta "1"))  \grg e8 [ A8 ] e8 [ \grg d16 b16 ] \bar "|"
+ \grg e16 [ g16 \grA f16 d16 ] \dble e8 [ \grg d16 b16 ] \bar "|"
+ \grg c16 [ d16 \slurc d16 b16 ] \grg G16 [ a16 \grg b16 \grd G16 ] \bar "|"
+ \grg a8 [ \wbirl a8 ] \grg a8 \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar ":|" \break
+ \set Score.repeatCommands = #'((volta "2"))  \grg e8 [ a8 ] \grg b16 [ a16 \grg b16 d16 ] \bar "|"
+ \grg e16 [ g16 \grA f16 d16 ] \dble e8 [ \grg d16 b16 ] \bar "|"
+ \grg G16 [ \grd G16 \grg b16 d16 ] \grg e16 [ d16 \grg b16 \grd G16 ] \bar "|"
+ \grg a8 [ \wbirl a8 ] \grg a4 \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar ":|:" \break
+
+ \grg e16 [ a16 \grg a16 \grd a16 ] \grg b16 [ a16 \grg b16 d16 ] \bar "|"
+ \grg e16 [ g16 \grA f16 d16 ] \dble e8 [ \grg d16 b16 ] \bar "|"
+ \grg c16 [ d16 \slurc d16 b16 ] \grg G16 [ \grd G16 \grg b16 d16 ] \bar "|"
+ \dble e8 [ g16 e16 ] \grg d16 [ b16 \grg c16 d16 ] \bar "|" \break
+
+ \set Score.repeatCommands = #'((volta "1"))  \grg e16 [ a16 \grg a16 \grd a16 ] A16 [ a16 \grg a16 g16 ] \bar "|"
+ g16 [ a16 \grg f16 a16 ] \dble e8 [ \grg d16 b16 ] \bar "|"
+ \grg G16 [ \grd G16 \grg b16 d16 ] \grg e16 [ d16 \grg b16 \grd G16 ] \bar "|"
+ \grg a8 [ \wbirl a8 ] \grg a4 \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar ":|" \break
+ \set Score.repeatCommands = #'((volta "2"))  \grg e16 [ a16 \grg a16 \grd a16 ] A16 [ a16 \grg a16 g16 ] \bar "|"
+ g16 [ a16 \grg f16 a16 ] \dble e8 [ \grg d16 b16 ] \bar "|"
+ \grg d16 [ \slurc d16 \grg e16 f16 ] \grA g16 [ f16 \grg e16 d16 ] \bar "|"
+ \grg e8 [ \gra e8 ] \dble e8 \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar ":|:" \break
+
+ \grg e16 [ g16 ] \bar "|"
+ \dblA A8 [ e16 g16 ] A16 [ g16 \grA e16 d16 ] \bar "|"
+ \grg e16 [ g16 \grA d16 e16 ] \dblA A8 [ g16 e16 ] \bar "|"
+ \thrwd d8 [ \grg e16 f16 ] \grg d16 [ b16 \grg b16 \grG b16 ] \bar "|"
+ \dble e8 [ g16 e16 ] \grg d16 [ b16 \grg c16 d16 ] \bar "|" \break
+
+ \set Score.repeatCommands = #'((volta "1"))  e16 [ A16 \grg A16 g16 ] \grA e16 [ d16 \grg e16 g16 ] \bar "|"
+ A16 [ g16 \grA e16 d16 ] \dble e8 [ \grg d16 b16 ] \bar "|"
+ \grg c16 [ d16 \slurc d16 b16 ] \grg G16 [ a16 \grg b16 \grd G16 ] \bar "|"
+ \grg a8 [ \wbirl a8 ] \grg a8 \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar ":|" \break
+ \set Score.repeatCommands = #'((volta "2"))  \grg e16 [ a16 \grg a16 \grd a16 ] A16 [ a16 \grg a16 g16 ] \bar "|"
+ g16 [ a16 \grg f16 a16 ] \dble e8 [ \grg d16 b16 ] \bar "|"
+ \grg G16 [ \grd G16 \grg b16 d16 ] \grg e16 [ d16 \grg b16 \grd G16 ] \bar "|"
+ \grg a8 [ \wbirl a8 ] \grg a4 \set Score.repeatCommands = #'((volta #f)) \bar "|"
+ \bar ".|" \break 
+
+			}
+
+\score {
+	\melody
+	\layout {
+	indent = 0.0\cm
+	\context { \Score \remove "Bar_number_engraver" }
+	}
+	\header {
+	title = "Converted from  BMW Dos file format to Bagpipe Reader 1.0 format using BMWFC32."
+	meter = "The Walrus"
+	arranger = "Hornpipe"
+	}
+	
+}
+
diff --git a/music/hornpipes/the_walrus/config.ily b/music/hornpipes/the_walrus/config.ily
index f93f43c..2aeefd0 100644
--- a/music/hornpipes/the_walrus/config.ily
+++ b/music/hornpipes/the_walrus/config.ily
@@ -3,10 +3,9 @@
 global = {
 	\time 2/4
 	}
-
 %% Format
 part = { \partial 8 s8 }
-halfline = { \repeat unfold 4 { s1 | } }
+halfline = { \repeat unfold 4 { s2 | } }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
diff --git a/music/hornpipes/the_walrus/full.ly b/music/hornpipes/the_walrus/full.ly
new file mode 100644
index 0000000..a1b8fb6
--- /dev/null
+++ b/music/hornpipes/the_walrus/full.ly
@@ -0,0 +1,100 @@
+\version "2.19.0"
+
+\include "config.ily"
+%\include "notes.bass.ily"
+%\include "notes.tenor.ily"
+\include "notes.side.ily"
+\include "notes.pipes.ily"
+
+\score {
+	\new StaffGroup <<
+		\new Staff {
+			\global
+			\pipeglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
+			<<
+				{
+					\repeat volta 2 { \part \line }
+			\break
+				\repeat volta 2 { \part \halfline}
+				\alternative{ {\halfline} {\halfline}}
+			\break
+				\repeat volta 2 { \part \halfline}
+				\alternative{ {\halfline} {\halfline}}
+			\break
+				\repeat volta 2 { \part \halfline}
+				\alternative{ {\halfline} {\halfline}}
+				}%Format
+				{
+				\pipesA s8
+
+				\pipesBA
+				\pipesBBA s8
+				\pipesBBB s8
+
+				\pipesCA
+				\pipesCBA s8
+				\pipesCBB s8
+
+				\pipesDA
+				\pipesDBA s8
+				\pipesDBB 
+				}%Pipes
+			>>
+		}
+		\new PipeBandDrumStaff = "side" {
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+
+			\snareAA 
+			\snareAB s8
+			
+			\snareBA 
+			\snareBBA s8
+			\snareAB s8
+
+			s8 s2*4
+			s2*4
+			s2*4
+
+			s8 s2*4
+			s2*4
+			s2*4
+		}
+		\new PipeBandDrumStaff = "bass" {
+			\bassglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+   			s8 | s2*8
+			s8 | s2*4 | s2*4 | s2*4
+			s8 | s2*4 | s2*4 | s2*4
+			s8 | s2*4 | s2*4 
+
+		}
+	%	\new PipeBandDrumStaff = "tenor" {
+	%		\tenorglobal
+	%		\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+	%		\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+	%	}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup \large {
+			\column \right-align {
+				$(if (not (string=? "" composerPipes)) { \markup {\line { \composerPipes  ":" }}} )
+				$(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=? "" composerPipes)) { \markup {\line { \instrumentPipes }}} )
+				$(if (not (string=? "" composerSide))  { \markup {\line { \instrumentSide }}} )
+				$(if (not (string=? "" composerTenor)) { \markup {\line { \instrumentTenor }}} )
+				$(if (not (string=? "" composerBass))  { \markup {\line { \instrumentBass }}} )
+			}
+		}
+	}
+}
diff --git a/music/hornpipes/the_walrus/notes.pipes.ily b/music/hornpipes/the_walrus/notes.pipes.ily
new file mode 100644
index 0000000..d68d372
--- /dev/null
+++ b/music/hornpipes/the_walrus/notes.pipes.ily
@@ -0,0 +1,79 @@
+% <<TimeSig>> <<Title>>
+% Pipes
+\version "2.18.2"
+composerPipes = "R. Mathieson"
+pipeglobal = {
+	\bagpipeKey
+	}
+pipesA = {
+	\grg b16 [ d16 ] |
+	\grg e8 [ a8 ] \grg b16 [ a16 \grg b16 d16 ] |
+	\grg e16 [ g16 \grA f16 d16 ] \dble e8 [ \grg d16 b16 ] |
+	\grg G16 [ d16 \grg d16 \slurc d16 ] \grg b16 [ a16 \grg b16 d16 ] |
+	\dble e8 [ g16 e16 ] \grg d16 [ b16 \grg c16 d16 ] | \break
+
+	\grg e8 [ a8 ] \grg b16 [ a16 \grg b16 d16 ] |
+	\grg e16 [ g16 \grA f16 d16 ] \dble e8 [ \grg d16 b16 ] |
+	\grg G16 [ \grd G16 \grg b16 d16 ] \grg e16 [ d16 \grg b16 \grd G16 ] |
+	\grg a8 [ \wbirl a8 ] \grg a8
+}
+
+pipesBA = {
+	\grg b16 [ d16 ] |
+	\grg e8 [ A8 ] e8 [ \grg d16 b16 ] |
+	\grg e16 [ g16 \grA f16 d16 ] \dble e8 [ \grg d16 b16 ] |
+	\grg G16 [ d16 \grg d16 \slurc d16 ] \grg b16 [ a16 \grg b16 d16 ] |
+	\dble e8 [ g16 e16 ] \grg d16 [ b16 \grg c16 d16 ] |
+}
+pipesBBA = {
+	\grg e8 [ A8 ] e8 [ \grg d16 b16 ] |
+	\grg e16 [ g16 \grA f16 d16 ] \dble e8 [ \grg d16 b16 ] |
+	\grg c16 [ d16 \slurc d16 b16 ] \grg G16 [ a16 \grg b16 \grd G16 ] |
+	\grg a8 [ \wbirl a8 ] \grg a8
+}
+pipesBBB = {
+	\grg e8 [ a8 ] \grg b16 [ a16 \grg b16 d16 ] |
+	\grg e16 [ g16 \grA f16 d16 ] \dble e8 [ \grg d16 b16 ] |
+	\grg G16 [ \grd G16 \grg b16 d16 ] \grg e16 [ d16 \grg b16 \grd G16 ] |
+	\grg a8 [ \wbirl a8 ] \grg a8
+}
+% Part 3
+pipesCA = {
+	a8 |
+	\grg e16 [ a16 \grg a16 \grd a16 ] \grg b16 [ a16 \grg b16 d16 ] |
+	\grg e16 [ g16 \grA f16 d16 ] \dble e8 [ \grg d16 b16 ] |
+	\grg c16 [ d16 \slurc d16 b16 ] \grg G16 [ \grd G16 \grg b16 d16 ] |
+	\dble e8 [ g16 e16 ] \grg d16 [ b16 \grg c16 d16 ] | \break
+}
+pipesCBA = {
+	\grg e16 [ a16 \grg a16 \grd a16 ] A16 [ a16 \grg a16 g16 ] |
+	g16 [ a16 \grg f16 a16 ] \dble e8 [ \grg d16 b16 ] |
+	\grg G16 [ \grd G16 \grg b16 d16 ] \grg e16 [ d16 \grg b16 \grd G16 ] |
+	\grg a8 [ \wbirl a8 ] \grg a8
+}
+pipesCBB = {
+	\grg e16 [ a16 \grg a16 \grd a16 ] A16 [ a16 \grg a16 g16 ] |
+	g16 [ a16 \grg f16 a16 ] \dble e8 [ \grg d16 b16 ] |
+	\grg d16 [ \slurc d16 \grg e16 f16 ] \grA g16 [ f16 \grg e16 d16 ] |
+	\grg e8 [ \gra e8 ] \dble e8
+}
+% Part 4
+pipesDA = {
+	\grg e16 [ g16 ] |
+	\dblA A8 [ e16 g16 ] A16 [ g16 \grA e16 d16 ] |
+	\grg e16 [ g16 \grA d16 e16 ] \dblA A8 [ g16 e16 ] |
+	\thrwd d8 [ \grg e16 f16 ] \grg d16 [ b16 \grg b16 \grG b16 ] |
+	\dble e8 [ g16 e16 ] \grg d16 [ b16 \grg c16 d16 ] |
+}
+pipesDBA = {
+	e16 [ A16 \grg A16 g16 ] \grA e16 [ d16 \grg e16 g16 ] |
+	A16 [ g16 \grA e16 d16 ] \dble e8 [ \grg d16 b16 ] |
+	\grg c16 [ d16 \slurc d16 b16 ] \grg G16 [ a16 \grg b16 \grd G16 ] |
+	\grg a8 [ \wbirl a8 ] \grg a8
+}
+pipesDBB = {
+	\grg e16 [ a16 \grg a16 \grd a16 ] A16 [ a16 \grg a16 g16 ] |
+	g16 [ a16 \grg f16 a16 ] \dble e8 [ \grg d16 b16 ] |
+	\grg G16 [ \grd G16 \grg b16 d16 ] \grg e16 [ d16 \grg b16 \grd G16 ] |
+	\grg a8 [ \wbirl a8 ] \grg a4
+}
\ No newline at end of file
diff --git a/music/hornpipes/the_walrus/notes.side.ily b/music/hornpipes/the_walrus/notes.side.ily
index dbaf43f..9bf1fca 100644
--- a/music/hornpipes/the_walrus/notes.side.ily
+++ b/music/hornpipes/the_walrus/notes.side.ily
@@ -1,6 +1,61 @@
-% <<TimeSig>> <<Title>>
+% 2/4 The Walrus
 % Side
 \version "2.18.2"
-composerSide = ""
-\snareA = \drummode {
-}
\ No newline at end of file
+composerSide = "E.T. de Boone, v0.3, 2016"
+sideglobal = {
+	\eighthBeaming
+}
+snareAA = \drummode {
+	d16 g |
+	\flam d8 \flam g
+	\flam d16 g d \flam g
+	|
+	d16 \flam g d g
+	d8:32( g16) g
+	|
+	\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 |
+}
+snareAB = \drummode {
+	\flam d8 \flam g
+	\flam d16 g d \flam g
+	|
+	d16 \flam g d g->
+	\triplet { d16 g d } \flam g16. g32
+	|
+	d16 g32 g d16 \flam g
+	d32 g d g	d16 g16
+	|
+	d16 d:64( d) g
+	\flam d8
+}
+snareBA = \drummode {
+	d16 g |
+	d8:32(-> g16) g
+	d8:32(-> g16) d32 d
+	|
+	g16 \flamd d g g
+	d8:32(-> g16) g
+	|
+	\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 |
+}	
+snareBBA = \drummode {	
+	d8:32(-> g16) g
+	d8:32(-> g16) d32 d
+	|
+	g16 \flamd d g g
+	d8:32(-> \triplet { g16) d g }
+	|
+	d16 g32 g d16 \flam g
+	d32 g d g	d16 g16
+	|
+	d16 d:64( d) g
+	\flam d8
+}
diff --git a/music/hornpipes/the_walrus/pipes.ly b/music/hornpipes/the_walrus/pipes.ly
new file mode 100644
index 0000000..8cba39c
--- /dev/null
+++ b/music/hornpipes/the_walrus/pipes.ly
@@ -0,0 +1,47 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			{
+				\repeat volta 2 { \part \line }
+			\break
+				\repeat volta 2 { \part \halfline}
+				\alternative{ {\halfline} {\halfline}}
+			\break
+				\repeat volta 2 { \part \halfline}
+				\alternative{ {\halfline} {\halfline}}
+			\break
+				\repeat volta 2 { \part \halfline}
+				\alternative{ {\halfline} {\halfline}}
+
+			}
+			{
+				\pipesA s8
+
+				\pipesBA
+				\pipesBBA s8
+				\pipesBBB s8
+
+				\pipesCA
+				\pipesCBA s8
+				\pipesCBB s8
+
+				\pipesDA
+				\pipesDBA s8
+				\pipesDBB s8
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/music/hornpipes/the_walrus/side.ly b/music/hornpipes/the_walrus/side.ly
index ee8dae0..c15db1a 100644
--- a/music/hornpipes/the_walrus/side.ly
+++ b/music/hornpipes/the_walrus/side.ly
@@ -6,9 +6,28 @@
 \score {
     \new PipeBandDrumStaff {
         \global
-        <<
-			{ }
-			{ }
+	\sideglobal
+		<<
+			{
+					\repeat volta 2 { \part \line }
+				\break
+					\repeat volta 2 { \part \halfline}
+					\alternative{ {\halfline} {\halfline}}
+				\break
+					\repeat volta 2 { \part \halfline}
+					\alternative{ {\halfline} {\halfline}}
+				\break
+					\repeat volta 2 { \part \halfline}
+					\alternative{ {\halfline} {\halfline}}
+			}
+			{
+				\snareAA 
+				\snareAB s8
+				
+				\snareBA 
+				\snareBBA s8
+				\snareAB s8
+			}
 		>>
 	}
 	\header {
@@ -17,4 +36,4 @@
 		instrument = \instrumentSide
 		composer = \composerSide
 	}
-}
\ No newline at end of file
+}
diff --git a/music/reels/the_mackenzies_reel/config.ily b/music/reels/the_mackenzies_reel/config.ily
new file mode 100644
index 0000000..6eea4b2
--- /dev/null
+++ b/music/reels/the_mackenzies_reel/config.ily
@@ -0,0 +1,13 @@
+\version "2.19.0"
+%% Globals
+global = {
+	\time 2/2
+	}
+%% Format
+part = { \partial 8 s8 }
+halfline = { \repeat unfold 2 { s1 | } }
+line = { \repeat unfold 2 { \halfline } }
+
+%% Headers
+title = "The MacKenzie's Reel"
+meter = "Reel"
diff --git a/music/reels/the_mackenzies_reel/notes.pipes.ily b/music/reels/the_mackenzies_reel/notes.pipes.ily
new file mode 100644
index 0000000..32e44d3
--- /dev/null
+++ b/music/reels/the_mackenzies_reel/notes.pipes.ily
@@ -0,0 +1,74 @@
+% 2/2 The MacKenzie's Reel
+% Pipes
+\version "2.18.2"
+composerPipes = ""
+pipeglobal = {
+	\bagpipeKey
+	}
+pipesA = {
+	A8 |
+	\birl a4 
+	\grg a8. [ b16 ] 
+	\dblc c4
+	\grg c16 [ A8. ] 
+	|
+	\dblc c4 
+	\grg c8 [ \grd b8 ] 
+	\grg c16 [ e8. ] 
+	\dblf f4 
+	|
+	\gbirl a4 
+	\grg a8. [ b16 ] 
+	\dblc c4 
+	A8. [ f16 ] 
+	|
+	\dble e8. [ c16 ] 
+	\grg b8 [ \grd c8 ] 
+	\grg a8. [ \grd a16 ] 
+	\gre a8 
+}
+
+pipesBA = {
+	f8 |
+	\grg e8. [ a16 ] 
+	\dble e8. [ c16 ]	
+	\dble e8. [ a16 ] 
+	\gbirl a8 [ A8 ] 
+	|
+	\grg e8. [ a16 ] 
+	\dble e8. [ c16 ]	 
+	\grg b8. [ \grd b16 ] 
+	\gre b8 [ f8 ] 
+	|
+	\grg e8. [ a16 ] 
+	\dble e8. [ c16 ]	 
+	\dble e8. [ a16 ] 
+	A8. [ f16 ] 
+	|
+	\dble e8. [ c16 ] 
+	\grg b8 [ \grd c8 ]	 
+	\grg a8. [ \grd a16 ]
+	\gre a8 f8 |
+}
+
+pipesBB = {
+	\grg e8. [ a16 ] 
+	\dble e8. [ c16 ] 
+	\dble e8. [ a16 ] 
+	\birl a8 [ A8 ] 
+	|
+	\grg e8. [ a16 ] 
+	\dble e8. [ c16 ] 
+	\grg b8. [ \grd b16 ] 
+	\gre b8 [ A8 ] 
+	|
+	\grip a4 
+	\grg a8. [ b16 ] 
+	\dblc c4 
+	A8. [ f16 ] 
+	|
+	\dble e8. [ c16 ] 
+	\grg b8 [ \grd c8 ] 
+	\grg a8. [ \grd a16 ] 
+	\gre a8 
+}
diff --git a/music/reels/the_mackenzies_reel/pipes.ly b/music/reels/the_mackenzies_reel/pipes.ly
new file mode 100644
index 0000000..f78d383
--- /dev/null
+++ b/music/reels/the_mackenzies_reel/pipes.ly
@@ -0,0 +1,29 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			{
+				\repeat volta 2 { \part \line } \break
+				\part \line \break
+				\line \bar "|."
+			}
+			{
+				\pipesA s8
+				\pipesBA
+				\pipesBB s8
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/music/template/bass.ly b/music/template/bass.ly
new file mode 100644
index 0000000..2734359
--- /dev/null
+++ b/music/template/bass.ly
@@ -0,0 +1,21 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.bass.ily"
+
+\score {
+    \new PipeBandDrumStaff {
+        \global
+	\tenorglobal
+		<<
+			{ }
+			{ }
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentBass
+		composer = \composerBass
+	}
+}
diff --git a/music/template/config.ily b/music/template/config.ily
index 61c2dff..871d3cc 100644
--- a/music/template/config.ily
+++ b/music/template/config.ily
@@ -3,7 +3,6 @@
 global = {
 	\time 4/4
 	}
-
 %% Format
 part = { \partial 8 s8 }
 halfline = { \repeat unfold 4 { s1 | } }
@@ -11,4 +10,4 @@ line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
 title = "Title"
-meter = "Meter"
\ No newline at end of file
+meter = "Meter"
diff --git a/music/template/drums.ly b/music/template/drums.ly
index 846ee3f..4ad9532 100644
--- a/music/template/drums.ly
+++ b/music/template/drums.ly
@@ -9,6 +9,7 @@
 	\new StaffGroup <<
 		\new PipeBandDrumStaff = "side" {
 			\global
+			\sideglobal
 			\set PipeBandDrumStaff.instrumentName = \markup{\instrumentSide}
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
@@ -18,11 +19,13 @@
 			>>
 		}
 		\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 }
 
@@ -44,4 +47,4 @@
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/music/template/full.ly b/music/template/full.ly
index bbecdd8..8728cdf 100644
--- a/music/template/full.ly
+++ b/music/template/full.ly
@@ -10,7 +10,7 @@
 	\new StaffGroup <<
 		\new Staff {
 			\global
-			\bagpipeKey
+			\pipeglobal
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
 			<<
@@ -19,16 +19,19 @@
 			>>
 		}
 		\new PipeBandDrumStaff = "side" {
+			\sideglobal
 			\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
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 
@@ -52,4 +55,4 @@
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/music/template/notes.bass.ily b/music/template/notes.bass.ily
index 4f6752c..ff89caf 100644
--- a/music/template/notes.bass.ily
+++ b/music/template/notes.bass.ily
@@ -2,5 +2,6 @@
 % Bass
 \version "2.18.2"
 composerBass  = ""
+bassglobal = {}
 bassA = \drummode {
-}
\ No newline at end of file
+}
diff --git a/music/template/notes.pipes.ily b/music/template/notes.pipes.ily
index db072ff..11d2f93 100644
--- a/music/template/notes.pipes.ily
+++ b/music/template/notes.pipes.ily
@@ -2,5 +2,8 @@
 % Pipes
 \version "2.18.2"
 composerPipes = ""
+pipeglobal = {
+	\bagpipeKey
+	}
 pipesA = {
-}
\ No newline at end of file
+}
diff --git a/music/template/notes.side.ily b/music/template/notes.side.ily
index dbaf43f..c3f5804 100644
--- a/music/template/notes.side.ily
+++ b/music/template/notes.side.ily
@@ -2,5 +2,6 @@
 % Side
 \version "2.18.2"
 composerSide = ""
+sidgeglobal = {}
 \snareA = \drummode {
-}
\ No newline at end of file
+}
diff --git a/music/template/pipes.ly b/music/template/pipes.ly
index facb3fb..5cbcfda 100644
--- a/music/template/pipes.ly
+++ b/music/template/pipes.ly
@@ -6,9 +6,9 @@
 \score {
     \new Staff {
 		\global
-		\bagpipeKey
+		\pipeglobal
 		<<
-            { }
+			{ }
 			{ }
 		>>
 	}
@@ -18,4 +18,4 @@
 		instrument = \instrumentPipes
 		composer = \composerPipes
 	}
-}
\ No newline at end of file
+}
diff --git a/music/template/side.ly b/music/template/side.ly
index ee8dae0..becc1fc 100644
--- a/music/template/side.ly
+++ b/music/template/side.ly
@@ -6,7 +6,8 @@
 \score {
     \new PipeBandDrumStaff {
         \global
-        <<
+	\tenorglobal
+		<<
 			{ }
 			{ }
 		>>
@@ -17,4 +18,4 @@
 		instrument = \instrumentSide
 		composer = \composerSide
 	}
-}
\ No newline at end of file
+}