diff --git a/airs/flower_of_scotland/5 Flower Of Scotland.bww b/airs/flower_of_scotland/5 Flower Of Scotland.bww
deleted file mode 100644
index b6d031f..0000000
--- a/airs/flower_of_scotland/5 Flower Of Scotland.bww	
+++ /dev/null
@@ -1,53 +0,0 @@
-Bagpipe Reader:1.0
-
-MIDINoteMappings,(54,56,58,59,61,63,64,66,68,56,58,60,61,63,65,66,68,70,55,57,59,60,62,64,65,67,69)
-
-FrequencyMappings,(370,415,466,494,554,622,659,740,831,415,466,523,554,622,699,740,831,932,392,440,494,523,587,659,699,784,880)
-
-InstrumentMappings,(71,71,45,33,1000,60,70)
-
-GracenoteDurations,(20,40,30,50,100,200,800,1200,250,250,250,500,200)
-
-FontSizes,(90,100,100,80,250)
-
-TuneFormat,(1,0,M,L,500,1500,500,500,L,0,0)
-
-TuneTempo,70
-
-"Flower of Scotland           ",(T,L,0,0,Times New Roman,16,700,0,0,18,0,0,0)
-
-"Slow air",(Y,C,0,0,Times New Roman,14,400,0,0,18,0,0,0)
-
-"november 18th 2009",(F,L,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-
-"The Seaforth Highlanders of  Holland",(F,R,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-
-" Traditional, arr. J.G.Slattery Scots Guards",(M,R,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-
-
-
-& sharpf sharpc 6_8 I!''	F_8
-
-!	echohg F_4 E_8		thrd D_4 'd
-!	eg LA_4 'la ^tla 	LA_4 echola LA_8
-!	thrd D_4 F_8		dbe E_4 'e
-!	echola E_4 D_8		echohg D_4 E_8			!t
-
-& sharpf sharpc	
-	dbf F_4 'f ^tf 			F_4 stre F_8	
-!	HGr_8 tg Fl_8 HGl_8	dbha HA_4 'ha
-!	thrd 	D_4 eg LA_8 		dbe E_4 strla E_8	
-!	gg Er_8 Dl_8 El_8		gg F_4	HG_8	
-!	dbf F_4 E_8			thrd D_4 'd !t
-
-& sharpf sharpc
-	eg LA_4 'la ^tla 		LA_4 F_8		
-!	HGr_8 tg Fl_8 HGl_8	dbha HA_4 'ha
-!	thrd D_4 'd ^td			D_4 F_8	
-!	dbhg HGr_8  Fr_8 El_8	dbf F_4 E_8	!t
-
-& sharpf sharpc
-		
-	thrd D_4 'd ^td		D_4 echoc D_8
-!	gg C_4 E_8		thrd D_4 'd ^td
-!	D_4 'd 	lgstd D_4			''!I
\ No newline at end of file
diff --git a/airs/flower_of_scotland/config.ily b/airs/flower_of_scotland/config.ily
index 9d30712..f480376 100644
--- a/airs/flower_of_scotland/config.ily
+++ b/airs/flower_of_scotland/config.ily
@@ -2,13 +2,16 @@
 %% Globals
 global = {
 	\time 6/8
-	}
-
+}
+confTempo = {
+	\tempo 2. = 60
+}
 %% Format
 part = { \partial 8 s8 }
-halfline = { \repeat unfold 2 { s2. | } }
+measure = {\grace{s1} s2. |}
+halfline = { \repeat unfold 2 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
 title = "Flower of Scotland"
-meter = "Air"
\ No newline at end of file
+meter = "Air"
diff --git a/airs/flower_of_scotland/full.ly b/airs/flower_of_scotland/full.ly
new file mode 100644
index 0000000..341b11d
--- /dev/null
+++ b/airs/flower_of_scotland/full.ly
@@ -0,0 +1,88 @@
+\version "2.19.0"
+
+\include "config.ily"
+%\include "notes.bass.ily"
+%\include "notes.tenor.ily"
+\include "notes.side.ily"
+\include "notes.pipes.ily"
+%\include "notes.pipes.seconds.ily"
+%\include "notes.lyrics.ily"
+
+\score {
+	\new StaffGroup <<
+		\new Staff {
+			\global
+			\pipeglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
+			<<
+				\new Voice = "format"
+			  	{
+					\repeat volta 2 {
+						\part
+						\repeat unfold 2 { \line \line \break }
+					}
+				}%Format
+
+				\new Voice = "pipes"
+				{
+					\pipesA s8
+				}%Pipes
+			>>
+		}
+%		\new Lyrics = "verse1" {
+%		  \lyricsglobal
+%		  \lyricsto "pipes" {
+%			\verseA
+%		  }
+%		}
+%		\new Staff = "seconds" {
+%			\pipessecndglobal
+%			\set Staff.instrumentName = \markup{ \instrumentPipes Seconds }
+%			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes 2nd}
+%
+%
+%		}
+		\new PipeBandDrumStaff = "side" {
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+
+			\snareA s8
+		}
+%		\new PipeBandDrumStaff = "tenor" {
+%			\tenorglobal
+%			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+%			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+%
+%		}
+%		\new PipeBandDrumStaff = "bass" {
+%			\bassglobal
+%			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+%			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+%
+%		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup \large {
+			\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} )
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \composerPipessecnd ":" }} #} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { "Lyrics" } } #} )
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \instrumentPipessecnd }}#} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}
diff --git a/airs/flower_of_scotland/lyrics.ly b/airs/flower_of_scotland/lyrics.ly
new file mode 100644
index 0000000..795470e
--- /dev/null
+++ b/airs/flower_of_scotland/lyrics.ly
@@ -0,0 +1,70 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+\include "notes.lyrics.ily"
+
+\score {
+%  \new StaffGroup <<
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+		  	\new Voice = "format"
+			{
+			  \repeat volta 2 {
+				  \part
+				  \repeat unfold 2 { 
+					\line 
+					\line
+				  }
+				  \break
+			  }
+			}%Format
+			\new Voice = "tune"
+			{
+			  \pipesA s8
+			}
+%		>>
+%	}
+%	\new Staff = "align" {
+		\lyricsglobal
+		\new NullVoice = "align" {
+%		\new Voice = "align" {
+				\lyricsA s8
+		}
+%	}
+		\new Lyrics = "lyrics" {
+			\lyricsto "align" { 
+				\verseA	
+			}
+		}
+ 	  >>
+	}
+%  >>
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentLyrics
+		composer = \markup \large {
+		  	\column \right-align {
+			  $(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics } } #} )
+			  $(if (not (string=? "" composerPipes)) #{ \markup { \line { \composerPipes  ":" } } #} )
+		  	}
+			\column \right-align {
+			    $(if (not (string=? "" composerPipes)) #{ \markup { \line { \instrumentPipes  } } #} )
+			}
+		}
+
+	}
+}
+\markup {
+  \fill-line{
+	\column {
+	  \verseBblock
+	  \combine \null \vspace #0.5
+	  \verseCblock
+	}
+  }
+}
+
diff --git a/airs/flower_of_scotland/notes.lyrics.ily b/airs/flower_of_scotland/notes.lyrics.ily
new file mode 100644
index 0000000..c0bb20a
--- /dev/null
+++ b/airs/flower_of_scotland/notes.lyrics.ily
@@ -0,0 +1,82 @@
+% 6/8 Flower of Scotland
+% Lyrics
+\version "2.18.2"
+composerLyrics  = "Roy M.B. Williamson, the Corries"
+lyricsglobal = {
+	\bagpipeKey
+}
+% Music
+lyricsA = {
+	f8 |
+	f8 f8 e8 d4. |
+	a4.~ a4 a8 |
+	d4 f8 e4.~ |
+	e4 d8 d4 e8 | 
+
+	f4.~ f4 f8 |
+	g8( [  f8) g8 ] A4. |
+	d4 a8 e4 e8 |
+	e8( [ d8) e8 ] f4 g8 |
+	f4 e8 d4. | 
+
+	a4.~ a4 f8 |
+	g8( [ f8) g8 ] A4. |
+	d4.~ d4 f8 |
+	g8( [ f8) e8 ] f4( e8) | 
+
+	d4.~ d4 d8 |
+	c4 e8 d4.~ |
+	d4.~ d4 
+}
+
+verseA = \lyricmode {
+  	\set stanza = #"1."
+	O Flow- er of Scot- land,
+	When will we see
+	Your like a- gain,
+	That fought and died for,
+	Your wee bit Hill and Glen,
+	And stood a- gainst him,
+	Proud Ed- ward's Ar- my,
+	And sent him home- ward,
+	To think a- gain__
+}
+
+verseAblock = \markup { \column{
+	\line{ \bold "1."}
+    \line{O Flower of Scotland,}
+    \line{When will we see}
+    \line{Your like again,}
+    \line{That fought and died for,}
+    \line{Your wee bit Hill and Glen,}
+    \line{And stood against him,}
+    \line{Proud Edward's Army,}
+    \line{And sent him homeward,}
+    \line{To think again.}
+}}
+
+verseBblock = \markup {\column {
+	\line{ \bold "2."}
+    \line{The Hills are bare now,}
+    \line{And Autumn leaves}
+    \line{Lie thick and still,}
+    \line{O'er land that is lost now,}
+    \line{Which those so dearly held,}
+    \line{That stood against him,}
+    \line{Proud Edward's Army,}
+    \line{And sent him homeward,}
+    \line{To think again.}
+}}
+
+verseCblock = \markup {\column {
+	\line{ \bold "3."}
+  	\line{Those days are past now,}
+  	\line{And in the past}
+  	\line{They must remain,}
+  	\line{But we can still rise now,}
+  	\line{And be the nation again,}
+  	\line{That stood against him,}
+  	\line{Proud Edward's Army,}
+  	\line{And sent him homeward,}
+  	\line{To think again.}
+}}
diff --git a/airs/flower_of_scotland/notes.pipes.ily b/airs/flower_of_scotland/notes.pipes.ily
new file mode 100644
index 0000000..29d4f74
--- /dev/null
+++ b/airs/flower_of_scotland/notes.pipes.ily
@@ -0,0 +1,30 @@
+% 6/8 Flower of Scotland
+% Pipes
+\version "2.18.2"
+composerPipes = ""
+pipeglobal = {
+	\bagpipeKey
+}
+% Music
+pipesA = {
+	f8 |
+	\echog f4 e8 \thrwd d4. |
+	\gre a4.~ a4 \echoa a8 |
+	\thrwd d4 f8 \dble e4. |
+	\echoa e4 d8 \echog d4 e8 | 
+
+	\dblf f4.~ f4 \slure f8 |
+	g8 [ \grA f8 g8 ] \dblA A4. |
+	\thrwd d4 \gre a8 \dble e4 \gra e8 |
+	\grg e8 [ d8 e8 ] \grg f4 g8 |
+	\dblf f4 e8 \thrwd d4. | 
+
+	\gre a4.~ a4 f8 |
+	g8 [ \grA f8 g8 ] \dblA A4. |
+	\thrwd d4.~ d4 f8 |
+	\dblg g8 [ f8 e8 ] \dblf f4 e8 | 
+
+	\thrwd d4.~ d4 \echoc d8 |
+	\grg c4 e8 \thrwd d4.~ |
+	d4. \dbld d4
+}
diff --git a/airs/flower_of_scotland/notes.side.ily b/airs/flower_of_scotland/notes.side.ily
index b702d19..bf1ad38 100644
--- a/airs/flower_of_scotland/notes.side.ily
+++ b/airs/flower_of_scotland/notes.side.ily
@@ -2,6 +2,7 @@
 % Side
 \version "2.18.2"
 composerSide = ""
+sideglobal = {} 
 snareA = \drummode {
 	g8 |
 	\flam d8 d:32( g)	\flam d8 g16. d32 g16. g32 |
@@ -23,4 +24,4 @@ snareA = \drummode {
 	d4.:32( d4.) |
 	\flam d8 d:32( g)	\flam d8 g16. d32 g16. g32 |
 	\flam d8 g16. d32 g16. g32	\flam d4
-}
\ No newline at end of file
+}
diff --git a/airs/flower_of_scotland/pipes.ly b/airs/flower_of_scotland/pipes.ly
new file mode 100644
index 0000000..e54df8c
--- /dev/null
+++ b/airs/flower_of_scotland/pipes.ly
@@ -0,0 +1,43 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			{ 
+				\repeat volta 2 {
+				  \part
+				  \repeat unfold 2 { \line \line \break }
+				 }
+			}%Format
+			{
+			  \pipesA s8
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\partial 8
+		\pipesA
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/airs/highland_cathedral/config.ily b/airs/highland_cathedral/config.ily
new file mode 100644
index 0000000..4625518
--- /dev/null
+++ b/airs/highland_cathedral/config.ily
@@ -0,0 +1,17 @@
+\version "2.19.0"
+%% Globals
+global = {
+	\time 4/4
+	}
+confTempo = { 
+	\tempo 4 = 40 
+	}
+%% Format
+part = { \partial 8 s8 }
+measure = { \grace {s1} s1 | }
+halfline = { \repeat unfold 4 \measure }
+line = { \repeat unfold 2 { \halfline } }
+
+%% Headers
+title = "Highland Cathedral"
+meter = "Air"
diff --git a/airs/highland_cathedral/hc.bww b/airs/highland_cathedral/hc.bww
deleted file mode 100644
index 11bea30..0000000
--- a/airs/highland_cathedral/hc.bww
+++ /dev/null
@@ -1,68 +0,0 @@
-Bagpipe Reader:1.0
-
-MIDINoteMappings,(54,56,58,59,61,63,64,66,68,56,58,60,61,63,65,66,68,70,55,57,59,60,62,64,65,67,69)
-
-FrequencyMappings,(370,415,466,494,554,622,659,740,831,415,466,523,554,622,699,740,831,932,392,440,494,523,587,659,699,784,880)
-
-InstrumentMappings,(71,71,45,33,1000,60,70)
-
-GracenoteDurations,(20,40,30,50,100,200,800,1200,250,250,250,500,200)
-
-FontSizes,(90,100,100,80,225)
-
-TuneFormat,(1,0,F,L,500,500,500,500,L,1,0)
-
-TuneTempo,66
-
-"Slow Air",(T,C,0,0,Palatino Linotype,14,400,0,0,18,0,0,0)
-
-
-"The Highland Cathedral",(Y,L,0,0,Palatino Linotype,16,700,0,0,18,0,0,0)
-
-
-"arr. Marc Goudswaart",(M,R,0,0,Palatino Linotype,10,400,0,0,18,0,0,0)
-
-
-
-"The Seaforth Highlanders of Holland",(F,R,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-"21",(F,C,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-"2002",(F,L,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-
-"solo piper deel A, dan second piper erbij bij deel B, dan hele band bij A.",(I,L,0,0,Palatino Linotype,11,700,0,0,18,0,0,0)
- 
-& sharpf sharpc 4_4 
-I!     D_4 'd   Er_16 Fl_16	dbe Er_8 Dl_8		gg LAr_8 Dl_8 	
-!       dbe E_4 'e   F_8 						gg F_2 
-!       gg  F_4 'f  HGr_16 HAl_16	HGr_8 Fl_8		dbe  Er_8 Dl_8 	
-!       dbe  E_4  F_8  	gg LA_2 		space	!t 
-
-& sharpf sharpc    space	space	
-! 	gg  B_4 'b Cr_16 Dl_16 		dbd  Dr_8 LAl_8	gg Cr_8 Dl_8 	
-!       dbha  HA_4 'ha  HG_8		tg  F_2 
-!       gg  E_4 'e  Fr_16 HGl_16		dbf Fr_8 Dl_8		gg LAr_8 Dl_8 
-!       dbe  E_4 'e  D_8				lgstd D_2 		!I 
-
-
-
-& sharpf sharpc        
-I!    	dbc C_4 'c  eg LA_8			gg  E_4 'e  gg Cr_16 El_16
-!      	dbf F_4 'f  C_8				dbc  C_4 'c B_8 
-!       strlg  LA_4      	gg   LAr_8 Br_16 Cl_16         	gg B_2 
-!       gg C_4 		gg  Cr_8 Dr_16 El_16      dbb  B_2 !t 
-
-& sharpf sharpc  	
-!	dbc C_4 'c  eg LA_8			gg E_4 'e  gg Cr_16 El_16
-!      	dbf  F_4 'f  C_8				dbc  C_4 'c  B_8 
-!       gg  LA_4      	gg   LAr_8 Br_16 Cl_16      	dbb  B_4 'b  gg  LA_8  
-!       gg ^ts LA_1	space space	space space	space 	space	LA_1 ^te 	space	
-!I
- 
- "Aanvullend alternatief einde bij hafabra.",(I,L,0,0,Palatino Linotype,11,700,0,0,0,0,0,0) 
-& sharpf sharpc  
-
-I!	HA_2 	hdbf F_2 
-!	strf HGr_8 strf HGl_8 	strf HGr_8 strf  HGl_8 D_2 	!I 
-
- 
-	
-
diff --git a/airs/highland_cathedral/notes.pipes.ily b/airs/highland_cathedral/notes.pipes.ily
new file mode 100644
index 0000000..49a4d0d
--- /dev/null
+++ b/airs/highland_cathedral/notes.pipes.ily
@@ -0,0 +1,37 @@
+% 4/4 Highland Cathedral
+% Pipes
+\version "2.18.2"
+composerPipes = "arr. Marc Goudswaart"
+pipeglobal = {
+	\bagpipeKey
+	}
+% Music
+pipesA = {
+	d4. e16 [ f16 ] \dble e8 [ d8 ] \grg a8 [ d8 ] |
+	\dble e4. f8 \grg f2 |
+	\grg f4. g16 [ A16 ] g8 [ f8 ] \dble e8 [ d8 ] |
+	\dble e4. f8 \grg a2 | 
+
+	\grg b4. c16 [ d16 ] \dbld d8 [ a8 ] \grg c8 [ d8 ] |
+	\dblA A4. g8 \grA f2 |
+	\grg e4. f16 [ g16 ] \dblf f8 [ d8 ] \grg a8 [ d8 ] |
+	\dble e4. d8 \dbld d2
+}
+
+pipesB = {
+	\dblc c4. \gre a8 \grg e4. \grg c16 [ e16 ] |
+	\dblf f4. c8 \dblc c4. b8 |
+	\grG a4 \grg a8 [ b16 c16 ] \grg b2 |
+	\grg c4 \grg c8 [ d16 e16 ] \dblb b2 | 
+
+	\dblc c4. \gre a8 \grg e4. \grg c16 [ e16 ] |
+	\dblf f4. c8 \dblc c4. b8 |
+	\grg a4 \grg a8 [ b16 c16 ] \dblb b4. \grg a8 |
+	\grg a1~ |
+	a1
+}
+
+pipesHafabraEnd = {
+	A2 \hdblf f2 |
+	\slurf g8 [ \slurf g8 ] \slurf g8 [ \slurf g8 ] d2
+}
diff --git a/airs/highland_cathedral/pipes.ly b/airs/highland_cathedral/pipes.ly
new file mode 100644
index 0000000..2a08c8f
--- /dev/null
+++ b/airs/highland_cathedral/pipes.ly
@@ -0,0 +1,61 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			{
+				\repeat volta 2 {
+				  	\mark \markup \small "A"
+					\line
+					\bar "||"
+					\break
+					\mark \markup \small "B"
+					\line 
+					\once \override Score.RehearsalMark #'break-visibility = #'#(#t #t #f)
+					\mark \markup { \small "D.C. al fine" }
+					\measure
+					\break
+				}
+				\mark \markup \small "HaFaBra"
+				\measure
+				\measure
+				\bar "|."
+
+			}%Format
+			{ 
+				\pipesA
+				\pipesB
+
+				\pipesHafabraEnd
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\pipesA
+		\pipesB
+		\pipesA
+		\pipesB
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/airs/loch_duich/Loch Duich.bww b/airs/loch_duich/Loch Duich.bww
deleted file mode 100644
index 90b2589..0000000
--- a/airs/loch_duich/Loch Duich.bww	
+++ /dev/null
@@ -1,86 +0,0 @@
-Bagpipe Reader:1.0
-
-MIDINoteMappings,(54,56,58,59,61,63,64,66,68,56,58,60,61,63,65,66,68,70,55,57,59,60,62,64,65,67,69)
-
-FrequencyMappings,(370,415,466,494,554,622,659,740,831,415,466,523,554,622,699,740,831,932,392,440,494,523,587,659,699,784,880)
-
-InstrumentMappings,(71,71,45,33,1000,60,70)
-
-GracenoteDurations,(20,40,30,50,100,200,800,1200,250,250,250,500,200)
-
-FontSizes,(90,100,100,80,250)
-
-TuneFormat,(1,0,F,L,500,500,500,500,L,1,0)
-
-

TuneTempo,60
-
-

"Loch Duich",(T,L,0,0,Times New Roman,16,700,0,0,18,0,0,0)
-

"Slow Air   ",(Y,C,0,0,Times New Roman,14,400,0,0,18,0,0,0)

"
- Ensign Christopher MacRae, arr.  Cpl. V.C. Kennedy",(M,R,0,0,Times New Roman,10,400,0,0,18,0,0,0)


-
-"PM FrankJan de Boone-The Seaforth Highlanders of Holland",(F,R,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-"L 2",(F,C,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-

"november 2011",(F,L,1000,1000,Times New Roman,10,400,0,0,18,0,0,0) 
-
-

& sharpf sharpc   6_8 I!'' gg  E_8  
-
!	dbc C_4  B_8 				gg Cr_16 ^ts El_16  E_4 ^te 
-
!	dbha HA_4 F_8 			gg Er_16 ^ts  Fl_16 F_4 ^te 
-
!	dbe E_4 C_8				gg Br_16 grp  ^ts Cl_16 C_4 ^te 
-
!	dbha HA_4 C_8			dbc Cr_16 eg ^ts  Bl_16 B_4 ^te 
-
!	dbc C_4  B_8 				gg Cr_16 ^ts El_16  E_4 ^te 
-
!	dbha HA_4 F_8 			gg Er_16 ^ts  Fl_16 F_4 ^te 
-
!	gg LA_4 tar LA_8			dbe E_4 C_8

-!	dbc Cr_16 eg ^ts  Bl_16		 B_4 ^te strlg LA_4
''!I
-
-
& sharpf sharpc   I!'' E_8 	
-!	grp C_4 eg B_8			grp C_4 eg B_8	

-!	grp C_4 eg B_8			dg Cr_16 ^ts  Fl_16 F_4 ^te 
-
!	dbc C_4 eg B_8			lhstd E_4 gg C_8
-
!	dbha HA_4 C_8			dbc Cr_16 eg ^ts  Bl_16 B_4 ^te 
-
!	dbc C_4  B_8 				gg Cr_16 ^ts El_16  E_4 ^te 
-
!	dbha HA_4 F_8 			gg Er_16 ^ts  Fl_16 F_4 ^te 
-
!	gg LA_4 tar LA_8			dbe E_4 C_8
-
!	dbc Cr_16 eg ^ts  Bl_16		 B_4 ^te strlg LA_4
''!I

-
-& sharpf sharpc   I!'' E_8

-! 	gg LA_4 tar LA_8			dbe E_4 LA_8
!	dbc C_4 eg LA_8			dbe E_4 C_8

-!	gg B_4 tar B_8			dbf F_4 B_8
-
!	thrd D_4 eg B_8			dbf F_4 E_8
-
!	gg LA_4 tar LA_8			dbe E_4 LA_8

-!	dbc C_4 eg B_8			gg Cr_16 ^ts El_16  E_4 ^te 
-
!	dbf  F_4 E_8				dbha HA_4 C_8
-
!	dbc Cr_16 eg ^ts  Bl_16		 B_4 ^te strlg LA_4
''!I
"
-
-
-
-"Seconds",(I,L,0,0,Times New Roman,11,400,0,0,18,0,0,0)
- 
-
& sharpf sharpc  6_8  I!'' gg E_8  
-!
	gg LA_4  B_8 				gg LAr_16 grp ^ts Cl_16 C_4 ^te 
-
!	thrd D_4 eg D_8 			Cr_16 thrd ^ts Dl_16 D_4 ^te 
-
!	gg C_4 strlg LA_8			dbb Br_16 strlg ^ts  LAl_16 LA_4 ^te 
-
!	thrd D_4 E_8				dbc Cr_16 eg ^ts  Bl_16 B_4 ^te 
-
!	gg LA_4 B_8				gg LAr_16  ^ts Cl_16   C_4 ^te 

-!	thrd D_4 eg D_8 			gg Cr_16  ^ts Dl_16  D_4 ^te 
-
!	gg C_4 tar LA_8			dbc C_4 E_8
-
!	dbc Cr_16 eg ^ts  Bl_16		B_4 ^te  strlg LA_4
''!I   
-
-
& sharpf sharpc   I!'' E_8
-!	gg LA_4  B_8				strlg LA_4  B_8	

-!	strlg LA_4 B_8				gg LAr_16 thrd ^ts Dl_16 D_4 ^te 
-
!	gg LA_4 eg B_8			strlg LA_4 dg C_8
-
!	thrd D_4 E_8				dbc Cr_16 eg ^ts Bl_16 B_4 ^te 
-
!	gg LA_4  B_8				gg LA_4   C_8
-
!	thrd D_4 eg D_8 			gg Cr_16  ^ts Dl_16  D_4 ^te 
-
!	gg C_4 tar LA_8			dbc C_4 E_8

-!	dbc Cr_16 eg ^ts  Bl_16		B_4 ^te  strlg LA_4
''!I
-
-
& sharpf sharpc   I!'' E_8
-!	gg LA_4 tar LA_8			dbc C_4  LA_8		
-!	brl LA_4 eg LA_8			dbc C_4  LA_8
-
!	gg LGr_8 'lg dg LGl_16 eg LGl_8 	lhstd D_4  LG_8

-!	dbb B_4 eg LG_8			lhstd D_4 C_8

-!	gg LA_4 tar LA_8			dbc C_4  LA_8
-
!	gg LA_4  B_8				strlg  LAr_16 Cl_16 ^tc C_4

-!	thrd D_4 C_8				dbf F_4  LA_8
-
!	dbc Cr_16 eg ^ts  Bl_16		B_4 ^te  strlg LA_4
''!I

\ No newline at end of file
diff --git a/airs/loch_duich/config.ily b/airs/loch_duich/config.ily
index 21973bf..9153546 100644
--- a/airs/loch_duich/config.ily
+++ b/airs/loch_duich/config.ily
@@ -3,12 +3,15 @@
 global = {
 	\time 6/8
 	}
-
+confTempo = {
+  \tempo 2. = 40
+}
 %% Format
-part = { \partial 8 s8 }
-halfline = { \repeat unfold 4 { s2. | } }
+part = { \partial 8 \grace {s1} s8 }
+measure = { \grace {s1} s2. | }
+halfline = { \repeat unfold 4 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
 title = "Loch Duich"
-meter = "Slow Air"
\ No newline at end of file
+meter = "Slow Air"
diff --git a/airs/loch_duich/full.ly b/airs/loch_duich/full.ly
new file mode 100644
index 0000000..3d56036
--- /dev/null
+++ b/airs/loch_duich/full.ly
@@ -0,0 +1,110 @@
+\version "2.19.0"
+
+\include "config.ily"
+%\include "notes.bass.ily"
+%\include "notes.tenor.ily"
+\include "notes.side.ily"
+\include "notes.pipes.ily"
+\include "notes.pipes.seconds.ily"
+%\include "notes.lyrics.ily"
+
+\score {
+	\new StaffGroup <<
+		\new Staff {
+			\global
+			\pipeglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
+			<<
+				\new Voice = "format"
+			  	{
+					\repeat unfold 2 {
+					  	\repeat volta 2 {
+						  	\part \line
+							\break
+						}
+					}
+					  \part \line \bar "||"
+					  \break
+					  \part \line \bar "|."
+				
+				}%Format
+
+				\new Voice = "pipes"
+				{
+					\pipesA s8
+					\pipesB s8
+
+					\pipesC s8
+					\pipesC s8
+				
+				}%Pipes
+			>>
+		}
+%		\new Lyrics = "verse1" {
+%		  \lyricsglobal
+%		  \lyricsto "pipes" {
+%			\verseA
+%		  }
+%		}
+		\new Staff = "seconds" {
+			\pipessecndglobal
+			\set Staff.instrumentName = \markup{ \instrumentPipes Seconds }
+			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes 2nd}
+			\pipessecndA s8
+			\pipessecndB s8
+
+			\pipessecndC s8
+			\pipessecndC s8
+
+		}
+		\new PipeBandDrumStaff = "side" {
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+				s8 \snareA
+				s8 \snareB
+
+				s8 \snareCA
+				s8 \snareCBA
+
+				s8 \snareCA 
+				s8 \snareCBB
+
+		}
+%		\new PipeBandDrumStaff = "tenor" {
+%			\tenorglobal
+%			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+%			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+%
+%		}
+%		\new PipeBandDrumStaff = "bass" {
+%			\bassglobal
+%			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+%			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+%
+%		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup \large {
+			\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} )
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \composerPipessecnd ":" }} #} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { "Lyrics" } } #} )
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \instrumentPipessecnd }}#} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}
diff --git a/airs/loch_duich/notes.pipes.ily b/airs/loch_duich/notes.pipes.ily
new file mode 100644
index 0000000..78c9b0a
--- /dev/null
+++ b/airs/loch_duich/notes.pipes.ily
@@ -0,0 +1,43 @@
+% 6/8 Loch Section
+% Pipes
+\version "2.18.2"
+composerPipes = "Ensign Christopher MacRae, arr.  Cpl. V.C. Kennedy"
+pipeglobal = {
+	\bagpipeKey
+	}
+% Music
+pipesA = {
+\grg e8 |
+ \dblc c4 b8 \grg c16 [ e16~ ] e4 |
+ \dblA A4 f8 \grg e16 [ f16~ ] f4 |
+ \dble e4 c8 \grg b16 [ \grip c16~ ] c4 |
+ \dblA A4 c8 \dblc c16 [ \gre b16~ ] b4 |
+ \dblc c4 b8 \grg c16 [ e16~ ] e4 |
+ \dblA A4 f8 \grg e16 [ f16~ ] f4 |
+ \grg a4 \taor a8 \dble e4 c8 |
+ \dblc c16 [ \gre b16~ ] b4 \grG a4
+}
+
+pipesB = {
+ e8 |
+ \grip c4 \gre b8 \grip c4 \gre b8 |
+ \grip c4 \gre b8 \grd c16 [ f16~ ] f4 |
+ \dblc c4 \gre b8 \whslurd e4 \grg c8 |
+ \dblA A4 c8 \dblc c16 [ \gre b16~ ] b4 |
+ \dblc c4 b8 \grg c16 [ e16~ ] e4 |
+ \dblA A4 f8 \grg e16 [ f16~ ] f4 |
+ \grg a4 \taor a8 \dble e4 c8 |
+ \dblc c16 [ \gre b16~ ] b4 \grG a4
+}
+
+pipesC = {
+ e8 |
+ \grg a4 \taor a8 \dble e4 a8 |
+ \dblc c4 \gre a8 \dble e4 c8 |
+ \grg b4 \taor b8 \dblf f4 b8 |
+ \thrwd d4 \gre b8 \dblf f4 e8 |
+ \grg a4 \taor a8 \dble e4 a8 |
+ \dblc c4 \gre b8 \grg c16 [ e16~ ] e4 |
+ \dblf f4 e8 \dblA A4 c8 |
+ \dblc c16 [ \gre b16~ ] b4 \grG a4
+}
diff --git a/airs/loch_duich/notes.pipes.seconds.ily b/airs/loch_duich/notes.pipes.seconds.ily
new file mode 100644
index 0000000..def8a6f
--- /dev/null
+++ b/airs/loch_duich/notes.pipes.seconds.ily
@@ -0,0 +1,42 @@
+% 6/8 Loch Duich
+% Pipes (Seconds)
+\version "2.18.2"
+composerPipesSecnd = "Ensign Christopher MacRae, arr.  Cpl. V.C. Kennedy"
+pipessecndglobal = {
+	\bagpipeKey
+	}
+pipessecndA = {
+\grg e8 |
+ \grg a4 b8 \grg a16 [ \grip c16~ ] c4 |
+ \thrwd d4 \gre d8 c16 [ \thrwd d16~ ] d4 |
+ \grg c4 \grG a8 \dblb b16 [ \grG a16~ ] a4 |
+ \thrwd d4 e8 \dblc c16 [ \gre b16~ ] b4 |
+ \grg a4 b8 \grg a16 [ c16~ ] c4 |
+ \thrwd d4 \gre d8 \grg c16 [ d16~ ] d4 |
+ \grg c4 \taor a8 \dblc c4 e8 |
+ \dblc c16 [ \gre b16~ ] b4 \grG a4
+}
+
+pipessecndB = {
+ e8 |
+ \grg a4 b8 \grG a4 b8 |
+ \grG a4 b8 \grg a16 [ \thrwd d16~ ] d4 |
+ \grg a4 \gre b8 \grG a4 \grd c8 |
+ \thrwd d4 e8 \dblc c16 [ \gre b16~ ] b4 |
+ \grg a4 b8 \grg a4 c8 |
+ \thrwd d4 \gre d8 \grg c16 [ d16~ ] d4 |
+ \grg c4 \taor a8 \dblc c4 e8 |
+ \dblc c16 [ \gre b16~ ] b4 \grG a4
+}
+
+pipessecndC = {
+ e8 |
+ \grg a4 \taor a8 \dblc c4 a8 |
+ \wbirl a4 \gre a8 \dblc c4 a8 |
+ \grg G8. [ \grd G16 \gre G8 ] \whslurd d4 G8 |
+ \dblb b4 \gre G8 \whslurd d4 c8 |
+ \grg a4 \taor a8 \dblc c4 a8 |
+ \grg a4 b8 \grG a16 [ c16 ] c4 |
+ \thrwd d4 c8 \dblf f4 a8 |
+ \dblc c16 [ \gre b16~ ] b4 \grG a4
+}
diff --git a/airs/loch_duich/notes.side.ily b/airs/loch_duich/notes.side.ily
index 2c76ef3..9e7f49c 100644
--- a/airs/loch_duich/notes.side.ily
+++ b/airs/loch_duich/notes.side.ily
@@ -2,45 +2,46 @@
 % Side
 \version "2.18.2"
 composerSide = ""
+sideglobal = {} 
 snareA = \drummode {
-	\flamd d4 \flamd d8		d16:64( d8) d16:64( d8) |
-	d4:32( d8)		\dragd d16 d-> g g \flamd d8 |
+	\flam d4 \flam d8		d16:64( d8) d16:64( d8) |
+	d4:32( d8)		\drag d16 d-> g g \flam d8 |
 
-	\flamd d4 \flamd d8 	d16:64( d8) d16:64( d8) |
-	d4:32(	g8:32)(->		\tuplet 3/2 { d16) g d-> } g16 g \flamd d8 |
+	\flam d4 \flam d8 	d16:64( d8) d16:64( d8) |
+	d4:32(	g8:32)(->		\tuplet 3/2 { d16) g d-> } g16 g \flam d8 |
 
-	\flamd d4 \flamd d8		d16:64( d8) d16:64( d8) |
-	d4:32( d8)		\dragd d16 d-> g g \flamd d8 |
+	\flam d4 \flam d8		d16:64( d8) d16:64( d8) |
+	d4:32( d8)		\drag d16 d-> g g \flam d8 |
 
-	\flamg g8 d8:32( d8)		r8 d8:32( d8) |
-	\dragd d16 d-> g g \flamd d8		d4.:32(\< |
+	\flam g8 d8:32( d8)		r8 d8:32( d8) |
+	\drag d16 d-> g g \flam d8		d4.:32(\< |
 }
 snareB = \drummode {
 	d4)\! g8		d8:32( d8) g8 |
-	d8:32( d8) g8		\dragd d16 d-> g g \flamd d8 |
+	d8:32( d8) g8		\drag d16 d-> g g \flam d8 |
 
-	\flamg g4 g8		d8:32( d8) g8 |
-	d4:32(	g8:32)(->		\tuplet 3/2 { d16) g d-> } g16 g \flamd d8 |
+	\flam g4 g8		d8:32( d8) g8 |
+	d4:32(	g8:32)(->		\tuplet 3/2 { d16) g d-> } g16 g \flam d8 |
 
-	\flamd d4 \flamd d8		d16:64( d8) d16:64( d8) |
-	d4:32( d8)		\dragd d16 d-> g g \flamd d8 |
+	\flam d4 \flam d8		d16:64( d8) d16:64( d8) |
+	d4:32( d8)		\drag d16 d-> g g \flam d8 |
 
-	\flamg g8 d8:32( d8)		r8 d8:32( d8) |
-	\dragd d16 d-> g g \flamd d8		d4.:32(\< |
+	\flam g8 d8:32( d8)		r8 d8:32( d8) |
+	\drag d16 d-> g g \flam d8		d4.:32(\< |
 }
 snareCA = \drummode {
-	d8)\! \tuplet 3/2 { d16 g d } \flamg g8		d8:32( \tuplet 3/2 { d16) g d } \flamg g8 |
+	d8)\! \tuplet 3/2 { d16 g d } \flam g8		d8:32( \tuplet 3/2 { d16) g d } \flam g8 |
 	d8 g16 d-> g g		d4.:32(\< |
 
-	d8)\! \tuplet 3/2 { d16 g d } \flamg g8		d8:32( \tuplet 3/2 { d16) g d } \flamg g8
-	d4:32(	g8:32)(->		\tuplet 3/2 { d16) g d-> } g16 g \flamd d8 |
+	d8)\! \tuplet 3/2 { d16 g d } \flam g8		d8:32( \tuplet 3/2 { d16) g d } \flam g8
+	d4:32(	g8:32)(->		\tuplet 3/2 { d16) g d-> } g16 g \flam d8 |
 
-	d8 \tuplet 3/2 { d16 g d } \flamg g8		d8:32( \tuplet 3/2 { d16) g d } \flamg g8 |
-	d4:32( d8)		\dragd d16 d-> g g \flamd d8 |
+	d8 \tuplet 3/2 { d16 g d } \flam g8		d8:32( \tuplet 3/2 { d16) g d } \flam g8 |
+	d4:32( d8)		\drag d16 d-> g g \flam d8 |
 }
 snareCBA = \drummode {
-	\dragd d16 d-> g g \flamd d8		d4.:32(\< |
+	\drag d16 d-> g g \flam d8		d4.:32(\< |
 }
 snareCBB = \drummode {
-	\dragd d16)\! d-> g g \flamd d8		\flamd d4. |
-}
\ No newline at end of file
+	\drag d16)\! d-> g g \flam d8		\flam d4. |
+}
diff --git a/airs/loch_duich/pipes.full.ly b/airs/loch_duich/pipes.full.ly
new file mode 100644
index 0000000..7a26637
--- /dev/null
+++ b/airs/loch_duich/pipes.full.ly
@@ -0,0 +1,102 @@
+\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 }
+			<<
+			  	\new Voice = "format"
+				{ 
+				  \repeat unfold 3 {
+					  \repeat volta 2 {
+						\part \line
+						\break
+					  }
+					}
+				  }%Format
+				\new Voice = "pipes"
+				{
+					\pipesA s8
+					\pipesB s8
+					\pipesC s8
+				}%Pipes
+			>>
+		}
+		\new Staff = "seconds" {
+			\pipessecndglobal
+			\set Staff.instrumentName = \markup{ \instrumentPipes Seconds }
+			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes 2nd}
+			
+				\pipessecndA s8
+				\pipessecndB s8
+				\pipessecndC s8
+				
+		}
+%		\new Staff = "thirds" {
+%			\pipesthrdglobal
+%			\set Staff.instrumentName = \markup{ \instrumentPipes Thirds }
+%			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes 3rd }
+%
+%		}
+	>>
+	\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 }}#} )
+			}
+		}
+	}
+}
+\score {
+	\new StaffGroup <<
+		\global
+		\new Staff = "pipes" {
+			\pipeglobal
+			\set Staff.midiInstrument = #"bagpipe"
+			%%Tune
+			\pipesA
+        	\pipesB
+        	\pipesC
+
+		}
+		\new Staff = "seconds" {
+			\pipessecndglobal
+			\set Staff.midiInstrument = #"bagpipe"
+			%% Seconds
+			\pipessecndA
+			\pipessecndB
+			\pipessecndC
+
+		}
+%		\new Staff = "thirds" {
+%			\pipesthrdglobal
+%			\set Staff.midiInstrument = #"bagpipe"
+%			%% Thirds
+%		
+%		}
+	>>
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/airs/loch_duich/pipes.ly b/airs/loch_duich/pipes.ly
new file mode 100644
index 0000000..657846b
--- /dev/null
+++ b/airs/loch_duich/pipes.ly
@@ -0,0 +1,56 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			{ 
+				\repeat unfold 3 {
+				  \repeat volta 2 {
+					\part \line
+					\break
+				  }
+				}
+			}%Format
+			{ 
+				\pipesA s8
+
+				\pipesB s8
+
+				\pipesC s8
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+			\partial 8
+				\pipesA
+				\pipesA
+
+				\pipesB
+				\pipesB
+
+				\pipesC
+				\pipesC
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/airs/loch_duich/pipes.seconds.ly b/airs/loch_duich/pipes.seconds.ly
new file mode 100644
index 0000000..acaf4db
--- /dev/null
+++ b/airs/loch_duich/pipes.seconds.ly
@@ -0,0 +1,58 @@
+\version "2.18.2"
+
+\include "config.ily"
+\include "notes.pipes.seconds.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipessecndglobal
+		<<
+			{ 
+				\repeat unfold 3 {
+				  \repeat volta 2 {
+					\part \line
+					\break
+				  }
+				}
+			}%Format
+			{ 
+				\pipessecndA s8
+
+				\pipessecndB s8
+
+				\pipessecndC s8
+			}
+		  >>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentSecnd
+		composer = \composerPipesSecnd
+	}
+}
+\score {
+	\new Staff { \global \pipessecndglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+			\partial 8
+				\pipessecndA
+				\pipessecndA
+
+				\pipessecndB
+				\pipessecndB
+
+				\pipessecndC
+				\pipessecndC
+
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentSecnd
+		composer = \composerPipesSecnd
+	}
+
+}
diff --git a/airs/loch_duich/side.ly b/airs/loch_duich/side.ly
index 1d78b2d..63d51b1 100644
--- a/airs/loch_duich/side.ly
+++ b/airs/loch_duich/side.ly
@@ -10,10 +10,11 @@
 			{
 				\repeat volta 2 { \line \break}
 				\repeat volta 2 { \line \break}
-				\repeat volta 2 { \halfline s2. s2.}
+				\repeat volta 2 { \halfline s2. s2. s2. }
 					\alternative {
-						{ s2.} {s2.}
+					  { \grace {s1} s2.} {\grace{s1}s2.}
 				}
+				\bar "|."
 			}
 			{
 				\snareA
@@ -30,4 +31,4 @@
 		instrument = \instrumentSide
 		composer = \composerSide
 	}
-}
\ No newline at end of file
+}
diff --git a/airs/morag_of_dunvegan/bass.ly b/airs/morag_of_dunvegan/bass.ly
index 877f709..6e90d5b 100644
--- a/airs/morag_of_dunvegan/bass.ly
+++ b/airs/morag_of_dunvegan/bass.ly
@@ -7,7 +7,7 @@
     \new PipeBandDrumStaff {
 		\global
 		<<
-			{\formatA \formatB}
+			{\repeat volta 2 {\line}\break\repeat volta 2 {\line}\break}
 			{\bassA \bassB}
 		>>
 	}
@@ -17,4 +17,4 @@
 		instrument = \instrumentBass
 		composer = \composerBass
 	}
-}
\ No newline at end of file
+}
diff --git a/airs/morag_of_dunvegan/config.ily b/airs/morag_of_dunvegan/config.ily
index b6ac8da..aecf2da 100644
--- a/airs/morag_of_dunvegan/config.ily
+++ b/airs/morag_of_dunvegan/config.ily
@@ -3,16 +3,15 @@
 global = {
 	\time 6/8
 	}
-
+confTempo = { 
+	\tempo 2. = 45 
+	}
 %% Format
-formatA = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } \break }
-formatB = { \repeat volta 2 { \repeat unfold 8 { s4. s4. } } \break }
+part = { \partial 8 s8 }
+measure = { \grace {s1} s2. | }
+halfline = { \repeat unfold 4 \measure }
+line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
 title = "Morag of Dunvegan"
 meter = "Slow Air"
-
-composerSide  = ""
-composerTenor = ""
-composerBass  = ""
-composerPipes = ""
\ No newline at end of file
diff --git a/airs/morag_of_dunvegan/drums.ly b/airs/morag_of_dunvegan/drums.ly
index aab186d..b3daf08 100644
--- a/airs/morag_of_dunvegan/drums.ly
+++ b/airs/morag_of_dunvegan/drums.ly
@@ -13,7 +13,7 @@
 
 			\global
 			<<
-				{ \formatA	\formatB }
+				{\repeat volta 2 {\line}\break\repeat volta 2 {\line}\break}
 				{ \snareA	\snareB }
 			>>
 		}
@@ -48,4 +48,4 @@
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/airs/morag_of_dunvegan/full.ly b/airs/morag_of_dunvegan/full.ly
new file mode 100644
index 0000000..322ba6f
--- /dev/null
+++ b/airs/morag_of_dunvegan/full.ly
@@ -0,0 +1,89 @@
+\version "2.19.0"
+
+\include "config.ily"
+\include "notes.bass.ily"
+\include "notes.tenor.ily"
+\include "notes.side.ily"
+\include "notes.pipes.ily"
+%\include "notes.pipes.seconds.ily"
+%\include "notes.lyrics.ily"
+
+\score {
+	\new StaffGroup <<
+		\new Staff {
+			\global
+			\pipeglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
+			<<
+				\new Voice = "format"
+			  	{
+					\repeat volta 2 {\line}\break\repeat volta 2 {\line}\break
+				}%Format
+
+				\new Voice = "pipes"
+				{
+					\pipesA
+					\pipesB
+				}%Pipes
+			>>
+		}
+%		\new Lyrics = "verse1" {
+%		  \lyricsglobal
+%		  \lyricsto "pipes" {
+%			\verseA
+%		  }
+%		}
+%		\new Staff = "seconds" {
+%			\pipessecndglobal
+%			\set Staff.instrumentName = \markup{ \instrumentPipes Seconds }
+%			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes 2nd}
+%
+%
+%		}
+		\new PipeBandDrumStaff = "side" {
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+			\snareA
+			\snareB
+		}
+		\new PipeBandDrumStaff = "tenor" {
+			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+
+			\tenorA
+			\tenorB
+		}
+		\new PipeBandDrumStaff = "bass" {
+			\bassglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+			\bassA
+			\bassB
+		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup \large {
+			\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} )
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \composerPipessecnd ":" }} #} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { "Lyrics" } } #} )
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \instrumentPipessecnd }}#} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}
diff --git a/airs/morag_of_dunvegan/morag.bww b/airs/morag_of_dunvegan/morag.bww
deleted file mode 100644
index b8d4f22..0000000
--- a/airs/morag_of_dunvegan/morag.bww
+++ /dev/null
@@ -1,93 +0,0 @@
-
-Bagpipe Reader:1.0
-
-MIDINoteMappings,(54,56,58,59,61,63,64,66,68,56,58,60,61,63,65,66,68,70,55,57,59,60,62,64,65,67,69)
-
-FrequencyMappings,(370,415,466,494,554,622,659,740,831,415,466,523,554,622,699,740,831,932,392,440,494,523,587,659,699,784,880)
-
-InstrumentMappings,(71,71,45,33,1000,60,70)
-
-GracenoteDurations,(20,40,30,50,100,200,800,1200,250,250,250,500,200)
-
-FontSizes,(90,100,88,80,250)
-
-TuneFormat,(1,0,F,L,500,300,500,500,L,1,0)
-
-TuneTempo,40
-
-"  set 10 ",(T,L,0,0,Times New Roman,17,700,0,0,18,0,0,0)
-
-" Slow March - Quick March",(Y,C,0,0,Times New Roman,14,400,0,0,18,0,0,0)
-
-"N. Mathieson",(M,R,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-
-
-
-"The Seaforth Highlanders of Holland",(F,R,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-"11",(F,C,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-"January 14th 2012",(F,L,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-
-
-"Morag of Dunvegan ",(I,L,0,0,Times New Roman,11,700,0,0,18,0,0,0)
-
-& sharpf sharpc 6_8 I!''
-
-		gg C_4 grp C_8		dbc Cr_8 eg Bl_8 strlg LAl_8
-!		dbc C_4 E_8 			echola E_4 'e
-!		dbha HA_4 'ha			gg HAr_8 Fl_8 HAl_8
-!		hdbf F_4 E_8 			echola E_4 'e 				!t
-
-
-
-
-& sharpf sharpc
-		gg C_4 grp C_8 	dbc Cr_8 eg Bl_8 dg Cl_8
-!		dbf F_4 E_8		echola E_4 'e
-!		gg F_4 HA_8		hdbf Fr_8 El_8 Cl_8
-!		dbb B_4 'b		strlg LA_4 'lg  				''!I
-
-
-& sharpf sharpc I!''
-		dbha HA_4 'ha		gg HA_4 F_8	
-!		dbe E_4 LA_8		brl LA_4 'la
-!		gg C_4 grp C_8	dbc Cr_8 eg Bl_8 dg Cl_8
-!		dbf F_4 E_8		echola E_4 'e			!t
-
-& sharpf sharpc
-		dbha HA_4 'ha		gg HA_4 F_8
-!		dbe E_4 LA_8		brl LA_4 'la
-!		gg C_4 grp C_8	dbe E_4 C_8
-!		dbb B_4 'b		strlg LA_4 'la	''!I)
-
-
-
-
-"Bonnie Galloway",(I,L,0,0,Times New Roman,11,700,0,0,18,0,0,0)
-& sharpf sharpc 4_4 
-I!	gg F_4 		^tf Fr_8 Cl_8		gg E_4		D_4
-!	gg Br_8 Dl_8 	^td D_4			gg LA_2
-! 	gg LA_4 	^tla LAr_8 Bl_8		hvthrd D_4	F_4
-!	gg E_4 		^tf Er_8 Fl_8		dbe  E_4		LA_4 	!t
-
-& sharpf sharpc	
-	gg F_4 		^tf Fr_8 Cl_8		gg E_4		D_4
-!	gg Br_8 Dl_8 	^td D_4			eg LA_2
-! 	gg LA_4 	^tla LAr_8 Bl_8		hvthrd D_4	F_4
-!	gg E_4 	^te Er_8 Dl_8			lgstd D_2	!I
-
-& sharpf sharpc 
-	dbha HA_4 		^tha HAr_8 gg  HAl_8	 F_4 	hvthrd D_4
-!	dbha HA_4 	D_4			dbf   F_2
-!	dbha HA_4 		^tha HAr_8 gg HAl_8	 F_4 	hvthrd D_4
-! 	gg Cr_8 Bl_8	gg Cr_8 Dl_8		dbe E_4	LA_4 	!t
-
-& sharpf sharpc	
-	gg F_4 		^tf Fr_8 Cl_8		gg E_4		D_4
-!	gg Br_8 Dl_8 	^td D_4			gg LA_2
-! 	gg LA_4 	^tla LAr_8 Bl_8		hvthrd D_4	F_4
-!	gg E_4 	^te Er_8 Dl_8		lgstd D_4	!I
-
-
-
-
-
diff --git a/airs/morag_of_dunvegan/notes.bass.ily b/airs/morag_of_dunvegan/notes.bass.ily
index fc0d790..5e0de70 100644
--- a/airs/morag_of_dunvegan/notes.bass.ily
+++ b/airs/morag_of_dunvegan/notes.bass.ily
@@ -1,6 +1,7 @@
 % 6/8 Morag of Dunvegan
 % Bass
 \version "2.18.2"
+bassglobal ={}
 bassA = \drummode {
 	d4.		d8 r8 g8 |
 	d4.		d8 g8 d8 |
@@ -20,4 +21,4 @@ bassB = \drummode {
 	d4.		g4.	|
 	d4 g8		d4 g8	|
 	d8 g8 d8		g4.	|
-}
\ No newline at end of file
+}
diff --git a/airs/morag_of_dunvegan/notes.pipes.ily b/airs/morag_of_dunvegan/notes.pipes.ily
new file mode 100644
index 0000000..383d18c
--- /dev/null
+++ b/airs/morag_of_dunvegan/notes.pipes.ily
@@ -0,0 +1,30 @@
+% 6/8 Morag of Dunvegan
+% Pipes
+\version "2.18.2"
+composerPipes = "N. Mathieson"
+pipeglobal = {
+	\bagpipeKey
+	}
+% Music
+pipesA = {
+	\grg c4 \grip c8 \dblc c8 [ \gre b8 \grG a8 ] |
+	\dblc c4 e8 \echoA e4. |
+	\dblA A4. \grg A8 [ f8 A8 ] |
+	\hdblf f4 e8 \echoA e4. | 
+
+	\grg c4 \grip c8 \dblc c8 [ \gre b8 \grd c8 ] |
+	\dblf f4 e8 \echoA e4. |
+	\grg f4 A8 \hdblf f8 [ e8 c8 ] |
+	\dblb b4. \grG a4.
+}
+pipesB = {
+	\dblA A4. \grg A4 f8 |
+	\dble e4 a8 \wbirl a4. |
+	\grg c4 \grip c8 \dblc c8 [ \gre b8 \grd c8 ] |
+	\dblf f4 e8 \echoA e4. | 
+
+	\dblA A4. \grg A4 f8 |
+	\dble e4 a8 \wbirl a4. |
+	\grg c4 \grip c8 \dble e4 c8 |
+	\dblb b4. \grG a4.
+}
diff --git a/airs/morag_of_dunvegan/notes.side.ily b/airs/morag_of_dunvegan/notes.side.ily
index fac7c73..25708c0 100644
--- a/airs/morag_of_dunvegan/notes.side.ily
+++ b/airs/morag_of_dunvegan/notes.side.ily
@@ -1,6 +1,7 @@
 % 6/8 Morag of Dunvegan
 % Tenor
 \version "2.18.2"
+sideglobal={}
 snareA = \drummode {
 	\flamd d8 d8:32( g8)		\flamd d8 r8 \flamd d8 |
 	g8 d8:32( g8)		g8 \tuplet 3/2 { d16 g d } g8 |
@@ -27,4 +28,4 @@ snareB = \drummode {
 
 	\flamd d8 d8:32( g8)		\flamd d8 g16. d32-> g16. g32 |
 	d4.:32(		d4.)
-}
\ No newline at end of file
+}
diff --git a/airs/morag_of_dunvegan/notes.tenor.ily b/airs/morag_of_dunvegan/notes.tenor.ily
index 6e5e020..d9eae6d 100644
--- a/airs/morag_of_dunvegan/notes.tenor.ily
+++ b/airs/morag_of_dunvegan/notes.tenor.ily
@@ -1,6 +1,7 @@
 % 6/8 Morag of Dunvegan
 % Tenor
 \version "2.18.2"
+tenorglobal = {}
 tenorA = \drummode {
 	d8 g8 d8	g8 d8 g8 |
 	d8 g8 d8	g4.	|
@@ -26,4 +27,4 @@ tenorB = \drummode {
 
 	d8 g8 d8	g8 d8 g8 |
 	d8 g8 d8	g4.
-}
\ No newline at end of file
+}
diff --git a/airs/morag_of_dunvegan/pipes.ly b/airs/morag_of_dunvegan/pipes.ly
new file mode 100644
index 0000000..e373faa
--- /dev/null
+++ b/airs/morag_of_dunvegan/pipes.ly
@@ -0,0 +1,50 @@
+\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
+			
+			}%Format
+			{ 
+				\pipesA
+
+				\pipesB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+
+		\pipesA
+		\pipesA
+
+		\pipesB
+		\pipesB
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/airs/morag_of_dunvegan/side.ly b/airs/morag_of_dunvegan/side.ly
index e51dc55..28abf9c 100644
--- a/airs/morag_of_dunvegan/side.ly
+++ b/airs/morag_of_dunvegan/side.ly
@@ -7,7 +7,7 @@
     \new PipeBandDrumStaff {
         \global
         <<
-			{\formatA \formatB}
+			{\repeat volta 2 {\line}\break\repeat volta 2 {\line}\break}
 			{\snareA \snareB}
 		>>
 	}
@@ -17,4 +17,4 @@
 		instrument = \instrumentSide
 		composer = \composerSide
 	}
-}
\ No newline at end of file
+}
diff --git a/airs/morag_of_dunvegan/tenor.ly b/airs/morag_of_dunvegan/tenor.ly
index aade5e1..b860ce5 100644
--- a/airs/morag_of_dunvegan/tenor.ly
+++ b/airs/morag_of_dunvegan/tenor.ly
@@ -7,7 +7,7 @@
     \new PipeBandDrumStaff {
 		\global
         <<
-			{\formatA \formatB}
+			{\repeat volta 2 {\line}\break\repeat volta 2 {\line}\break}
 			{\tenorA \tenorB}
 		>>
 	}
@@ -17,4 +17,4 @@
 		instrument = \instrumentTenor
 		composer = \composerTenor
 	}
-}
\ No newline at end of file
+}
diff --git a/airs/my_home/config.ily b/airs/my_home/config.ily
index ad9fc49..ceb813b 100644
--- a/airs/my_home/config.ily
+++ b/airs/my_home/config.ily
@@ -2,13 +2,16 @@
 %% Globals
 global = {
 	\time 6/8
-	}
-
+}
+confTempo = {
+  \tempo 2. = 40
+}
 %% Format
-part = { \partial 8 s8 }
-halfline = { \repeat unfold 4 { s2. | } }
+part = { \partial 8 \grace{s1} s8}
+measure = { \grace {s1} s2. |}
+halfline = { \repeat unfold 4 { \measure } }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
 title = "My Home"
-meter = "Slow Air"
\ No newline at end of file
+meter = "Slow Air"
diff --git a/airs/my_home/full.ly b/airs/my_home/full.ly
new file mode 100644
index 0000000..5b28ded
--- /dev/null
+++ b/airs/my_home/full.ly
@@ -0,0 +1,91 @@
+\version "2.19.0"
+
+\include "config.ily"
+\include "notes.bass.ily"
+\include "notes.tenor.ily"
+\include "notes.side.ily"
+\include "notes.pipes.ily"
+%\include "notes.pipes.seconds.ily"
+%\include "notes.lyrics.ily"
+
+\score {
+	\new StaffGroup <<
+		\new Staff {
+			\global
+			\pipeglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
+			<<
+				\new Voice = "format"
+			  	{
+					\repeat volta 2 { \part \line \break}
+					\repeat volta 2 { \part \line \break}
+				}%Format
+
+				\new Voice = "pipes"
+				{
+					\pipesA s8
+					\pipesB s8
+				}%Pipes
+			>>
+		}
+%		\new Lyrics = "verse1" {
+%		  \lyricsglobal
+%		  \lyricsto "pipes" {
+%			\verseA
+%		  }
+%		}
+%		\new Staff = "seconds" {
+%			\pipessecndglobal
+%			\set Staff.instrumentName = \markup{ \instrumentPipes Seconds }
+%			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes 2nd}
+%
+%
+%		}
+		\new PipeBandDrumStaff = "side" {
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+			\snareA s8
+			\snareB s8
+		}
+		\new PipeBandDrumStaff = "tenor" {
+			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+			
+			s8 \tenorA s8
+			\tenorB s8
+		}
+		\new PipeBandDrumStaff = "bass" {
+			\bassglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+
+			\bassA s8
+			\bassB s8
+		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup \large {
+			\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} )
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \composerPipessecnd ":" }} #} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { "Lyrics" } } #} )
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \instrumentPipessecnd }}#} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}
diff --git a/airs/my_home/home.bww b/airs/my_home/home.bww
deleted file mode 100644
index f6c4210..0000000
--- a/airs/my_home/home.bww
+++ /dev/null
@@ -1,97 +0,0 @@
-Bagpipe Reader:1.0
-
-MIDINoteMappings,(54,56,58,59,61,63,64,66,68,56,58,60,61,63,65,66,68,70,55,57,59,60,62,64,65,67,69)
-
-FrequencyMappings,(370,415,466,494,554,622,659,740,831,415,466,523,554,622,699,740,831,932,392,440,494,523,587,659,699,784,880)
-
-InstrumentMappings,(71,71,45,33,1000,60,70)
-
-GracenoteDurations,(20,40,30,50,100,200,800,1200,250,250,250,500,200)
-
-FontSizes,(90,100,100,80,250)
-
-TuneFormat,(1,0,F,L,500,300,500,500,L,1,0)
-
-TuneTempo,40
-
-"  set 9 ",(T,L,0,0,Times New Roman,17,700,0,0,18,0,0,0)
-
-"       Slow Air",(Y,C,0,0,Times New Roman,14,400,0,0,18,0,0,0)
-
-" Traditional",(M,R,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-
-"The Seaforth Highlanders of Holland",(F,R,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-"10",(F,C,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-" January 14th 2012",(F,L,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-
-"The Mist Covered Mountains ",(I,L,0,0,Times New Roman,11,700,0,0,18,0,0,0)
-& sharpf sharpc 6_8 
-I!'' 	gg B_4 'b 	tar B_4 'b space		
-!	gg F_4 	grp F_8 	dbf Fr_8 'f El_16 Cl_8 
-!	gg LA_4 'la 	brl LA_4 'la 	space
-!	dbe Cr_8 'c gg Bl_16 dg Cl_8 	dbb Br_8 'b strlg LAl_16 Bl_8 !t
-
-& sharpf sharpc 
-	thrd D_4 'd 	dbe E_4 'e  space	
-!	gg Fr_8 'f HGl_16 HAl_8 	hdbc Cr_8 'c gg Bl_16 dg LAl_8 
-!	gg Br_8 'b dg Cl_16 Fl_8 	dbe Er_8 'e Dl_16 Cl_8 
-!	gg  B_4 'b 	tar B_4 'b space	''!I
-
-& sharpf sharpc 
-I!'' 	gg F_4 'f 	grp F_4 'f  space	
-!	dbe Er_8 'e Fl_16 HAl_8 	hdbf Fr_8 'f El_16 Cl_8 
-!	gg LA_4 	tar LA_8 	dbe E_4 	C_8 
-!	gg F_4  	grp F_8 	dbe Er_8 'e Dl_16 Cl_8 !t
-
-& sharpf sharpc 
-	gg B_4 'b 	thrd D_4 'd  space	
-!	dbe Er_8 'e Fl_16 HAl_8 		hdbc Cr_8 'c gg Bl_16 dg LAl_8 
-!	gg Br_8 'b dg Cl_16 Fl_8 	dbe Er_8 'e Dl_16 Cl_8 
-!	 gg  B_4 'b '1  tar B_4 'b _'		'2 tar B_4  _'	 ''!I
-
-
-
-"My Home",(I,L,0,0,Times New Roman,11,700,0,0,18,0,0,0)
-
-
-
- 
-& sharpf sharpc   I!'' gg Er_16 'e Dl_32
-!	dbc Cr_8 'c eg Bl_16 dg Cl_8			gg LAr_8 'la dg Cl_16 El_8
-!	dbha HAr_8 'ha HGl_16 tg Fl_8		dbe E_4 thrd D_8
-!	dbc Cr_8 'c eg Bl_16 dg Cl_8			gg LA_4 gg Br_16 'b Cl_32
-!	thrd Dr_8 'd gg Cl_16 Dl_8			dbb B_4 dbe Er_16 'e Dl_32			 !t
-
-
-& sharpf sharpc
-	dbc Cr_8 'c eg Bl_16 dg LAl_8			gg LAr_8 'la dg Cl_16 El_8
-!	dbha HAr_8 'ha HGl_16 tg Fl_8		dbe E_4 thrd D_8
-!	dbc Cr_8 'c eg LAl_16 dg Cl_8		dbb Br_8 'b eg LGl_16 dg Bl_8
-!	gg LA_4 'la						brl LA_4		space					 ''!I
-
-
-
-
-& sharpf sharpc I!'' dbe E_8
-!	gg LAr_8 'la Bl_16 grp Cl_8			dbc Cr_8 'c eg Bl_16 dg Cl_8
-!	ag E_4 tar C_8					dbc C_4  E_8
-!	thrd Dr_8 'd gg Cl_16 Dl_8			dbb B_4 gg Cr_16 'c Dl_32
-!	dbe Er_8 'e Cl_16 gg LAl_8		brl LAr_8 'la dg Cl_16 El_8		 !t
-
-
-& sharpf sharpc
-	dbf Fr_8 'f gg Dl_16 Fl_8				dbha HAr_8 'ha HGl_16 Fl_8
-!	dbe Er_8 'e Dl_16  Cl_8			dbha HA_4 thrd D_8
-!	dbc Cr_8 'c eg LAl_16 dg Cl_8		dbb Br_8 'b eg LGl_16 dg Bl_8
-!	gg LA_4 'la					'1	brl LA_4	_'		'2  brl LA_4 'la	_'			 ''!I
-
-
-
-
-
-
-
-
-
-
-
diff --git a/airs/my_home/notes.bass.ily b/airs/my_home/notes.bass.ily
index 7eb7ef5..54bac63 100644
--- a/airs/my_home/notes.bass.ily
+++ b/airs/my_home/notes.bass.ily
@@ -2,5 +2,9 @@
 % Bass
 \version "2.18.2"
 composerBass  = ""
+bassglobal = {}
 bassA = \drummode {
-}
\ No newline at end of file
+}
+
+bassB = \drummode {
+}
diff --git a/airs/my_home/notes.pipes.ily b/airs/my_home/notes.pipes.ily
new file mode 100644
index 0000000..ee9d7c3
--- /dev/null
+++ b/airs/my_home/notes.pipes.ily
@@ -0,0 +1,33 @@
+% 6/8 My Home
+% Pipes
+\version "2.18.2"
+composerPipes = ""
+pipeglobal = {
+	\bagpipeKey
+	}
+% Music
+pipesA = {
+	\grg e16. [ d32 ] |
+ \dblc c8. [ \gre b16 \grd c8 ] \grg a8. [ \grd c16 e8 ] |
+ \dblA A8. [ g16 \grA f8 ] \dble e4 \thrwd d8 |
+ \dblc c8. [ \gre b16 \grd c8 ] \grg a4 \grg b16. [ c32 ] |
+ \thrwd d8. [ \grg c16 d8 ] \dblb b4 \dble e16. [ d32 ] | 
+
+ \dblc c8. [ \gre b16 \grd a8 ] \grg a8. [ \grd c16 e8 ] |
+ \dblA A8. [ g16 \grA f8 ] \dble e4 \thrwd d8 |
+ \dblc c8. [ \gre a16 \grd c8 ] \dblb b8. [ \gre G16 \grd b8 ] |
+ \grg a4. \wbirl a4
+}
+
+pipesB = {
+ \dble e8 |
+ \grg a8. [ b16 \grip c8 ] \dblc c8. [ \gre b16 \grd c8 ] |
+ \gra e4 \taor c8 \dblc c4 e8 |
+ \thrwd d8. [ \grg c16 d8 ] \dblb b4 \grg c16. [ d32 ] |
+ \dble e8. [ c16 \grg a8 ] \wbirl a8. [ \grd c16 e8 ] | 
+
+ \dblf f8. [ \grg d16 f8 ] \dblA A8. [ g16 f8 ] |
+ \dble e8. [ d16 c8 ] \dblA A4 \thrwd d8 |
+ \dblc c8. [ \gre a16 \grd c8 ] \dblb b8. [ \gre G16 \grd b8 ] |
+ \grg a4. \wbirl a4
+}
diff --git a/airs/my_home/notes.side.ily b/airs/my_home/notes.side.ily
index ca8b4b2..4610a8d 100644
--- a/airs/my_home/notes.side.ily
+++ b/airs/my_home/notes.side.ily
@@ -2,6 +2,7 @@
 % Side
 \version "2.18.2"
 composerSide = ""
+sideglobal = {}
 snareA = \drummode {
 	d8:32( |
 	g8.) d16 g8		\flamd d8. g16 d8 |
@@ -23,4 +24,4 @@ snareB = \drummode {
 	d8.) g16 d8		\flamd d4 g8 |
 	\flamd d8. g16 d8		\flamg g8. d16 g8 |
 	d4.:32(		d4)
-}
\ No newline at end of file
+}
diff --git a/airs/my_home/notes.tenor.ily b/airs/my_home/notes.tenor.ily
index ab14c75..abda985 100644
--- a/airs/my_home/notes.tenor.ily
+++ b/airs/my_home/notes.tenor.ily
@@ -2,6 +2,7 @@
 % Tenor
 \version "2.18.2"
 composerTenor = ""
+tenorglobal = {}
 tenorA = \drummode {
 	d4 d8 g8. d16 g8 |
 	d4. g4 d8 |
@@ -12,4 +13,7 @@ tenorA = \drummode {
 	d4 d8 g4. |
 	r8 g8 d8 r8 d8 g8
 	d8 g8 d8 g4.
-}
\ No newline at end of file
+}
+tenorB = \drummode {
+
+}
diff --git a/airs/my_home/pipes.ly b/airs/my_home/pipes.ly
new file mode 100644
index 0000000..b1f6847
--- /dev/null
+++ b/airs/my_home/pipes.ly
@@ -0,0 +1,46 @@
+\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 \line \break}
+			}%Format
+			{ 
+				\pipesA s8
+				\pipesB s8
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\partial 8
+		\pipesA
+		\pipesA
+
+		\pipesB
+		\pipesB
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/airs/the_mist_covered_mountains/config.ily b/airs/the_mist_covered_mountains/config.ily
index cabb9bf..972f28a 100644
--- a/airs/the_mist_covered_mountains/config.ily
+++ b/airs/the_mist_covered_mountains/config.ily
@@ -4,16 +4,15 @@ global = {
 	\time 6/8
 	}
 
+confTempo = {
+  \tempo 2. = 40
+}
 part = {\partial 8 s8 }
 %% Format
-formatA = { \repeat volta 2 { \part \repeat unfold 8 { s4. s4. } } \break }
-formatB = { \repeat volta 2 { \part \repeat unfold 8 { s4. s4. } } \break }
+measure = {\grace{s1} s2. | }
+halfline = { \repeat unfold 4 {\measure}}
+line = {\repeat unfold 2 {\halfline}}
 
 %% Headers
 title = "The Mist Covered Mountains"
 meter = "Slow Air"
-
-composerSide  = ""
-composerTenor = ""
-composerBass  = ""
-composerPipes = ""
\ No newline at end of file
diff --git a/airs/the_mist_covered_mountains/drums.ly b/airs/the_mist_covered_mountains/drums.ly
index 6e7918c..6532124 100644
--- a/airs/the_mist_covered_mountains/drums.ly
+++ b/airs/the_mist_covered_mountains/drums.ly
@@ -13,24 +13,36 @@
 
 			\global
 			<<
-				{\formatA	\formatB }
-				{\snareA	\snareB }
+				{
+					\repeat volta 2 { 
+						\part \line 
+			  		} 
+			  		\break
+					\repeat volta 2 {
+						\part \line
+					}
+				}
+				{
+				  \snareA s8
+				  \snareB s8
+				}
 			>>
 		}
-		\new PipeBandDrumStaff = "bass" {
-			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
-			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
-
-			%\bassA
-			%\bassB
-		}
 		\new PipeBandDrumStaff = "tenor" {
 			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
 
-			\tenorA
-			\tenorB
+			s8 \tenorA
+			s8 \tenorB
 		}
+%		\new PipeBandDrumStaff = "bass" {
+%			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+%			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+%
+%			\bassA
+%			\bassB
+%		}
+
 	>>
 	\header {
 		title = \title
@@ -48,4 +60,4 @@
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/airs/the_mist_covered_mountains/full.ly b/airs/the_mist_covered_mountains/full.ly
new file mode 100644
index 0000000..dddea9c
--- /dev/null
+++ b/airs/the_mist_covered_mountains/full.ly
@@ -0,0 +1,103 @@
+\version "2.19.0"
+
+\include "config.ily"
+%\include "notes.bass.ily"
+\include "notes.tenor.ily"
+\include "notes.side.ily"
+\include "notes.pipes.ily"
+%\include "notes.pipes.seconds.ily"
+%\include "notes.lyrics.ily"
+
+\score {
+	\new StaffGroup <<
+		\new Staff {
+			\global
+			\pipeglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
+			<<
+				\new Voice = "format"
+			  	{
+				  	\repeat volta 2 { 
+						\part \line 
+				  	} 
+				  	\break
+					\repeat volta 2 {
+						\part \line
+					}
+				}%Format
+
+				\new Voice = "pipes"
+				{
+				  s8 \pipesA
+
+				  s8 \pipesB
+				}%Pipes
+			>>
+		}
+%		\new Staff = "song" {
+%  			\lyricsglobal
+%			\new Voice = "lyrics"
+%			{}
+%		}
+%		\new Lyrics = "verse1" {
+%		  \lyricsglobal
+%		  \lyricsto "lyrics" {
+%			\verseA
+%		  }
+%		}
+%		\new Staff = "seconds" {
+%			\pipessecndglobal
+%			\set Staff.instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
+%			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentTrd}
+%
+%
+%		}
+		\new PipeBandDrumStaff = "side" {
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+			
+			\snareA s8
+
+			\snareB s8
+		}
+		\new PipeBandDrumStaff = "tenor" {
+			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+
+			s8 \tenorA
+
+			s8 \tenorB
+		}
+%		\new PipeBandDrumStaff = "bass" {
+%			\bassglobal
+%			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+%			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+%
+%		}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup \large {
+			\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} )
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \composerPipessecnd ":" }} #} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \composerSide  ":" }} #} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \composerTenor  ":" }} #} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \composerBass  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { "Lyrics" } } #} )
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \instrumentPipessecnd }}#} )
+				$(if (not (string=? "" composerSide))  #{ \markup {\line { \instrumentSide }}#} )
+				$(if (not (string=? "" composerTenor)) #{ \markup {\line { \instrumentTenor }}#} )
+				$(if (not (string=? "" composerBass))  #{ \markup {\line { \instrumentBass }}#} )
+			}
+		}
+	}
+}
diff --git a/airs/the_mist_covered_mountains/mist.bww b/airs/the_mist_covered_mountains/mist.bww
deleted file mode 100644
index f6c4210..0000000
--- a/airs/the_mist_covered_mountains/mist.bww
+++ /dev/null
@@ -1,97 +0,0 @@
-Bagpipe Reader:1.0
-
-MIDINoteMappings,(54,56,58,59,61,63,64,66,68,56,58,60,61,63,65,66,68,70,55,57,59,60,62,64,65,67,69)
-
-FrequencyMappings,(370,415,466,494,554,622,659,740,831,415,466,523,554,622,699,740,831,932,392,440,494,523,587,659,699,784,880)
-
-InstrumentMappings,(71,71,45,33,1000,60,70)
-
-GracenoteDurations,(20,40,30,50,100,200,800,1200,250,250,250,500,200)
-
-FontSizes,(90,100,100,80,250)
-
-TuneFormat,(1,0,F,L,500,300,500,500,L,1,0)
-
-TuneTempo,40
-
-"  set 9 ",(T,L,0,0,Times New Roman,17,700,0,0,18,0,0,0)
-
-"       Slow Air",(Y,C,0,0,Times New Roman,14,400,0,0,18,0,0,0)
-
-" Traditional",(M,R,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-
-"The Seaforth Highlanders of Holland",(F,R,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-"10",(F,C,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-" January 14th 2012",(F,L,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-
-"The Mist Covered Mountains ",(I,L,0,0,Times New Roman,11,700,0,0,18,0,0,0)
-& sharpf sharpc 6_8 
-I!'' 	gg B_4 'b 	tar B_4 'b space		
-!	gg F_4 	grp F_8 	dbf Fr_8 'f El_16 Cl_8 
-!	gg LA_4 'la 	brl LA_4 'la 	space
-!	dbe Cr_8 'c gg Bl_16 dg Cl_8 	dbb Br_8 'b strlg LAl_16 Bl_8 !t
-
-& sharpf sharpc 
-	thrd D_4 'd 	dbe E_4 'e  space	
-!	gg Fr_8 'f HGl_16 HAl_8 	hdbc Cr_8 'c gg Bl_16 dg LAl_8 
-!	gg Br_8 'b dg Cl_16 Fl_8 	dbe Er_8 'e Dl_16 Cl_8 
-!	gg  B_4 'b 	tar B_4 'b space	''!I
-
-& sharpf sharpc 
-I!'' 	gg F_4 'f 	grp F_4 'f  space	
-!	dbe Er_8 'e Fl_16 HAl_8 	hdbf Fr_8 'f El_16 Cl_8 
-!	gg LA_4 	tar LA_8 	dbe E_4 	C_8 
-!	gg F_4  	grp F_8 	dbe Er_8 'e Dl_16 Cl_8 !t
-
-& sharpf sharpc 
-	gg B_4 'b 	thrd D_4 'd  space	
-!	dbe Er_8 'e Fl_16 HAl_8 		hdbc Cr_8 'c gg Bl_16 dg LAl_8 
-!	gg Br_8 'b dg Cl_16 Fl_8 	dbe Er_8 'e Dl_16 Cl_8 
-!	 gg  B_4 'b '1  tar B_4 'b _'		'2 tar B_4  _'	 ''!I
-
-
-
-"My Home",(I,L,0,0,Times New Roman,11,700,0,0,18,0,0,0)
-
-
-
- 
-& sharpf sharpc   I!'' gg Er_16 'e Dl_32
-!	dbc Cr_8 'c eg Bl_16 dg Cl_8			gg LAr_8 'la dg Cl_16 El_8
-!	dbha HAr_8 'ha HGl_16 tg Fl_8		dbe E_4 thrd D_8
-!	dbc Cr_8 'c eg Bl_16 dg Cl_8			gg LA_4 gg Br_16 'b Cl_32
-!	thrd Dr_8 'd gg Cl_16 Dl_8			dbb B_4 dbe Er_16 'e Dl_32			 !t
-
-
-& sharpf sharpc
-	dbc Cr_8 'c eg Bl_16 dg LAl_8			gg LAr_8 'la dg Cl_16 El_8
-!	dbha HAr_8 'ha HGl_16 tg Fl_8		dbe E_4 thrd D_8
-!	dbc Cr_8 'c eg LAl_16 dg Cl_8		dbb Br_8 'b eg LGl_16 dg Bl_8
-!	gg LA_4 'la						brl LA_4		space					 ''!I
-
-
-
-
-& sharpf sharpc I!'' dbe E_8
-!	gg LAr_8 'la Bl_16 grp Cl_8			dbc Cr_8 'c eg Bl_16 dg Cl_8
-!	ag E_4 tar C_8					dbc C_4  E_8
-!	thrd Dr_8 'd gg Cl_16 Dl_8			dbb B_4 gg Cr_16 'c Dl_32
-!	dbe Er_8 'e Cl_16 gg LAl_8		brl LAr_8 'la dg Cl_16 El_8		 !t
-
-
-& sharpf sharpc
-	dbf Fr_8 'f gg Dl_16 Fl_8				dbha HAr_8 'ha HGl_16 Fl_8
-!	dbe Er_8 'e Dl_16  Cl_8			dbha HA_4 thrd D_8
-!	dbc Cr_8 'c eg LAl_16 dg Cl_8		dbb Br_8 'b eg LGl_16 dg Bl_8
-!	gg LA_4 'la					'1	brl LA_4	_'		'2  brl LA_4 'la	_'			 ''!I
-
-
-
-
-
-
-
-
-
-
-
diff --git a/airs/the_mist_covered_mountains/notes.pipes.ily b/airs/the_mist_covered_mountains/notes.pipes.ily
new file mode 100644
index 0000000..e4f3662
--- /dev/null
+++ b/airs/the_mist_covered_mountains/notes.pipes.ily
@@ -0,0 +1,30 @@
+% 6/8 Mist Covered Mountains
+% Pipes
+\version "2.18.2"
+composerPipes = ""
+pipeglobal = {
+	\bagpipeKey
+	}
+% Music
+pipesA = {
+ \grg b4. \taor b4. |
+ \grg f4 \grip f8 \dblf f8. [ e16 c8 ] |
+ \grg a4. \wbirl a4. |
+ \dble c8. [ \grg b16 \grd c8 ] \dblb b8. [ \grG a16 b8 ] | 
+
+ \thrwd d4. \dble e4. |
+ \grg f8. [ g16 A8 ] \hdblc c8. [ \grg b16 \grd a8 ] |
+ \grg b8. [ \grd c16 f8 ] \dble e8. [ d16 c8 ] |
+ \grg b4. \taor b4. 
+}
+pipesB = {
+ \grg f4. \grip f4. |
+ \dble e8. [ f16 A8 ] \hdblf f8. [ e16 c8 ] |
+ \grg a4 \taor a8 \dble e4 c8 |
+ \grg f4 \grip f8 \dble e8. [ d16 c8 ] | 
+
+ \grg b4. \thrwd d4. |
+ \dble e8. [ f16 A8 ] \hdblc c8. [ \grg b16 \grd a8 ] |
+ \grg b8. [ \grd c16 f8 ] \dble e8. [ d16 c8 ] |
+ \grg b4.  \taor b4.
+}
diff --git a/airs/the_mist_covered_mountains/notes.side.ily b/airs/the_mist_covered_mountains/notes.side.ily
index bd59aa5..cfb1434 100644
--- a/airs/the_mist_covered_mountains/notes.side.ily
+++ b/airs/the_mist_covered_mountains/notes.side.ily
@@ -1,17 +1,18 @@
 \version "2.18.2"
+sideglobal = {}
 snareA = \drummode {
-	\partial 8 d8:32( |
-	g8.) d16 g8		d8[ r8 d8:32(] |
-	g8.) d16 g8		d8[ r8 d8:32(] |
-	g8.) d16 g8		d8. g16 d8 |
-	d4.:32(		d8)[ r8 d8:32(] |
+	d8:32( |
 	g8.) d16 g8		d8 r8 d8:32( |
 	g8.) d16 g8		d8 r8 d8:32( |
 	g8.) d16 g8		d8. g16 d8 |
-	d4.:32(		d4.) |
+	d4.:32(		d8) r8 d8:32( |
+	g8.) d16 g8		d8 r8 d8:32( |
+	g8.) d16 g8		d8 r8 d8:32( |
+	g8.) d16 g8		d8. g16 d8 |
+	d4.:32(		d4) 
 }
 snareB = \drummode {
-	\partial 8 d8 |
+	d8 |
 	d2.:32( |
 	d8.)-> g16 d8		g8. d16 g8 |
 	d2.:32( |
@@ -19,5 +20,5 @@ snareB = \drummode {
 	d2.:32( |
 	d8.)-> g16 d8		g8. d16 g8 |
 	r8 g8 d8		r8 d8 g8 |
-	d4.:32(		d4.) |
-}
\ No newline at end of file
+	d4.:32(		d4)
+}
diff --git a/airs/the_mist_covered_mountains/notes.tenor.ily b/airs/the_mist_covered_mountains/notes.tenor.ily
index fe1b048..d665733 100644
--- a/airs/the_mist_covered_mountains/notes.tenor.ily
+++ b/airs/the_mist_covered_mountains/notes.tenor.ily
@@ -1,8 +1,8 @@
 % 6/8 The Mist Covered Mountains
 % Tenor
 \version "2.18.2"
+tenorglobal = {}
 tenorA = \drummode {
-	\partial 8 s8
 	d4. g |
 	d4. g8 r8 g8 |
 	d4. g8. d16 g8 |
@@ -13,7 +13,6 @@ tenorA = \drummode {
 	d8 g8 d8 g8 r4
 }
 tenorB = \drummode {
-	\partial 8 s8
 	d4. g |
 	d4. g8 r8 g8 |
 	d4. g |
@@ -22,4 +21,4 @@ tenorB = \drummode {
 	d4. g8 r8 g8 |
 	r8. g16 d8 r8. d16 g8 |
 	d8 g8 d8 g8 r4
-}
\ No newline at end of file
+}
diff --git a/airs/the_mist_covered_mountains/pipes.ly b/airs/the_mist_covered_mountains/pipes.ly
new file mode 100644
index 0000000..ae15e0b
--- /dev/null
+++ b/airs/the_mist_covered_mountains/pipes.ly
@@ -0,0 +1,50 @@
+\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
+				}
+			}%Format
+			{
+			  \pipesA
+			  \pipesB
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\pipesA
+		\pipesA
+
+		\pipesB
+		\pipesB
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/airs/the_mist_covered_mountains/side.ly b/airs/the_mist_covered_mountains/side.ly
index bcc942a..5673e87 100644
--- a/airs/the_mist_covered_mountains/side.ly
+++ b/airs/the_mist_covered_mountains/side.ly
@@ -7,8 +7,19 @@
     \new PipeBandDrumStaff {
         \global
         <<
-			{\formatA	\formatB}
-			{\snareA	\snareB}
+			{
+			  	\repeat volta 2 { 
+					\part \line 
+			  	} 
+			  	\break
+				\repeat volta 2 {
+					\part \line
+				}
+			}
+			{
+			  \snareA s8
+			  \snareB s8
+			}
 		>>
 	}
 	\header {
@@ -17,4 +28,4 @@
 		instrument = \instrumentSide
 		composer = \composerSide
 	}
-}
\ No newline at end of file
+}
diff --git a/airs/the_mist_covered_mountains/tenor.ly b/airs/the_mist_covered_mountains/tenor.ly
index 9231675..a1646cc 100644
--- a/airs/the_mist_covered_mountains/tenor.ly
+++ b/airs/the_mist_covered_mountains/tenor.ly
@@ -7,8 +7,20 @@
     \new PipeBandDrumStaff {
 		\global
         <<
-			{\formatA	\formatB}
-			{\tenorA	\tenorB}
+			{
+			  	\repeat volta 2 { 
+					\line 
+			  	} 
+			  	\break
+				\repeat volta 2 {
+					\line
+				}
+			}
+			
+			{
+			  \tenorA
+			  \tenorB
+		 	}
 		>>
 	}
 	\header {
@@ -17,4 +29,4 @@
 		instrument = \instrumentTenor
 		composer = \composerTenor
 	}
-}
\ No newline at end of file
+}
diff --git a/strathspeys/lady_mackenzie_of_fairburn/Lady_MacKenzie_of_Fairburn_v2.bww b/strathspeys/lady_mackenzie_of_fairburn/Lady_MacKenzie_of_Fairburn_v2.bww
deleted file mode 100644
index 00bab33..0000000
--- a/strathspeys/lady_mackenzie_of_fairburn/Lady_MacKenzie_of_Fairburn_v2.bww
+++ /dev/null
@@ -1,81 +0,0 @@
-Bagpipe Reader:1.0
-
-MIDINoteMappings,(54,56,58,59,61,63,64,66,68,56,58,60,61,63,65,66,68,70,55,57,59,60,62,64,65,67,69)
-
-FrequencyMappings,(370,415,466,494,554,622,659,740,831,415,466,523,554,622,699,740,831,932,392,440,494,523,587,659,699,784,880)
-
-InstrumentMappings,(71,71,45,33,1000,60,70)
-
-GracenoteDurations,(20,40,30,50,100,200,800,1200,250,250,250,500,200)
-
-FontSizes,(90,100,100,80,250)
-
-TuneFormat,(1,0,M,L,500,500,500,500,L,0,0)
-
-TuneTempo,120
-
-"Lady MacKenzie of Fairburn",(T,L,0,0,Times New Roman,16,700,0,0,18,0,0,0)
-
-"Strathspey",(Y,C,0,0,Times New Roman,14,400,0,0,18,0,0,0)
-
-"Traditional Arr.Randy Stanley",(M,R,0,0,Times New Roman,14,400,0,0,18,0,0,0)
-
-"The Seaforth Highlanders of Holland",(F,R,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-"November, richardvdHorn 2014",(F,L,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-& sharpf sharpc C I!	D_8
-!	dbc Cr_8 'c El_16		dbha HA_4		HGr_16 Fl_16 El_8		dbha HA_4
-!	hdbc Cr_8 'c El_16 		dbha HAr_8 'ha Dl_16		dbc Cr_8 'c Bl_16		gg LAr_8 'la Dl_16
-!	dbc Cr_8 'c El_16		dbha HA_4		HGr_16 Fl_16 El_8		dbhg HG_4
-!	thrd Dr_8 'd El_16		dbhg HGr_8 'hg Dl_16		dbb Br_8 'b LAl_16		gg LGr_8 'lg Dl_16 		!I
-
-
-& sharpf sharpc	dbc Cr_8 'c El_16		dbha HA_4		HGr_16 Fl_16 El_8		dbha HA_4
-!	hdbc Cr_8 'c El_16 		dbha HAr_8 'ha Dl_16		dbc Cr_8 'c Bl_16		gg LAr_8 'la Dl_16
-!	dbc Cr_8 'c El_16		dbha HA_4 	HGr_16  Fl_16 El_8		dbhg HG_4
-!	thrd Dr_8 'd El_16		dbhg HGr_8 'hg Dl_16		dbb Br_8 'b LAl_16		gg LGr_8 'lg HAl_16  !I
-
-& sharpf sharpc I!	LAr_8 'la dg Cl_16		dbe Er_8 'e LAl_16		gg Fr_8 'f LAl_16		dbe E_4
-!	gg LAr_8 'la dg Cl_16		dbe Er_8 'e Dl_16		dbc Cr_8 'c Bl_16		gg LAr_8 'la HAl_16 
-!	LAr_8 'la dg Cl_16		dbe Er_8 'e LAl_16		gg Fr_8 'f LAl_16		dbe Er_8 'e  Cl_16  
-!	thrd Dr_8 'd El_16 		dbhg   HGr_8  'hg Dl_16   	dbb Br_8 'b   LAl_16 	gg LGr_8 'lg HAl_16  		!I
-
-& sharpf sharpc	LAr_8 'la dg Cl_16		dbe Er_8 'e LAl_16		gg Fr_8 'f LAl_16		dbe E_4
-!	gg LAr_8 'la dg Cl_16		dbe Er_8 'e Dl_16		dbc Cr_8 'c Bl_16		gg LAr_16 HAl_8 'ha
-!	LAr_8 'la dg Cl_16		gg Er_16 HAl_8 'ha		hdbf Fr_8 'f Dl_16		dbe Er_8 'e Cl_16
-!	thrd Dr_8 'd El_16		dbhg HGr_8 'hg Dl_16		dbb Br_8 'b LAl_16		gg LG_4		!I
-
-Bagpipe Reader:1.0
-"Converted from  Piob Mhor file format to Bagpipe Reader 1.0 format using BMWFC32."
-
-MIDINoteMappings,(55,57,59,60,62,64,65,67,69,57,59,61,62,64,66,67,69,71,56,58,60,61,63,65,66,68,70)
-FrequencyMappings,(392,440,494,523,587,659,699,784,880,440,494,554,587,659,740,784,880,988,415,466,523,554,622,699,740,831,932)
-InstrumentMappings,(71,71,46,34,1000,60,70)
-GracenoteDurations,(20,40,30,50,100,200,800,1200,250,250,250,500,200)
-
-FontSizes,(90,100,100,80,250)
-TuneFormat,(1,0,F,L,500,500,500,500,L,0,0)
-"Orig. Format: TuneFormat,(1,0,M,L,500,500,500,500,L,0,0)"
-
-"Strathspey  ",(T,C,0,0,Times New Roman,14,400,0,0,18,0,0,0)
-"The Keel Row",(Y,L,0,0,Times New Roman,16,700,0,0,18,0,0,0)
-"Scots Guards",(M,R,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-
-
-
-"PM FrankJan de Boone-The Seaforth Highlanders of Holland",(F,R,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-"K 2",(F,C,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-"2008",(F,L,0,0,Times New Roman,10,400,0,0,18,0,0,0)
-
-TuneTempo,120
-
-& sharpf sharpc 4_4 	
-I!'' dbf F_4		thrd Dr_8 'd  Fl_16		dbhg HG_4	hdbe Er_8 'e HGl_16
-! hdbf F_4 	thrd Dr_8 'd  Fl_16	 	dbe Er_8 'e  Cl_16		gg LAr_8 'la  HGl_16
-!  hdbf F_4 	thrd Dr_8 'd  Fl_16	 	dbhg HG_4 	hdbe Er_8 'e  HGl_16
-! hdbf Fr_8 'f  Dl_16 		dbe Er_8 'e  Cl_16	 	thrd D_4	 	lgstd D_4	space		''!I
-
-& sharpf sharpc space
-I!'' gg Cr_16  El_8 'e		strla Er_16  HAl_8 'ha	 hdbf F_4 	dbe Er_8 'e  Dl_16
-! dbc C_4 	gg LAr_8 'la  dg Cl_16 		dbb Br_8 'b  LAl_16 	gg LGr_8 'lg  Dl_16 
-!  gg Cr_16  El_8 'e	 	strla Er_16  HAl_8 'ha 	 hdbf F_4 	dbe Er_8 'e  Dl_16
-! gg Cr_16  dg LAl_8 	'la gg Br_16  dg LGl_8 	'lg gg LA_4 space space	brl LA_4 	space space		''!I
diff --git a/template/full.ly b/template/full.ly
index ba299c7..64ebd55 100644
--- a/template/full.ly
+++ b/template/full.ly
@@ -23,16 +23,21 @@
 				{}%Pipes
 			>>
 		}
+%		\new Staff = "song" {
+%  			\lyricsglobal
+%			\new Voice = "lyrics"
+%			{}
+%		}
 %		\new Lyrics = "verse1" {
 %		  \lyricsglobal
-%		  \lyricsto "pipes" {
+%		  \lyricsto "lyrics" {
 %			\verseA
 %		  }
 %		}
 %		\new Staff = "seconds" {
 %			\pipessecndglobal
-%			\set Staff.instrumentName = \markup{ \instrumentPipes Seconds }
-%			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes 2nd}
+%			\set Staff.instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
+%			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentTrd}
 %
 %
 %		}
diff --git a/template/lyrics.ly b/template/lyrics.ly
index b1528ce..e4f0740 100644
--- a/template/lyrics.ly
+++ b/template/lyrics.ly
@@ -9,12 +9,12 @@
 		\global
 		\lyricsglobal
 		<<
-		  	\new Voice = "format"
-			{ }%Format
-%			\new Voice = "tune"
-%			{ }
+%		  	\new Voice = "format"
+%			{ }%Format
+			\new Voice = "tune"
+			{ }
 			\new Lyrics = "lyrics" {
-				\lyricsto "format" { 
+				\lyricsto "tune" { 
 			
 				}
 			}
@@ -26,12 +26,13 @@
 		instrument = \instrumentLyrics
 		composer = \markup \large {
 		  	\column \right-align {
+			  $(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics } } #} )
 			  $(if (not (string=? "" composerPipes)) #{ \markup { \line { \composerPipes  ":" } } #} )
-			  $(if (not (string=? "" composerLyrics)) #{ \markup { \line { \composerLyrics ":" } } #} )
 		  	}
 			\column \right-align {
+			  $(if (not (string=? "" composerLyrics)) #{ \markup { \line { } } #} )
+
 			    $(if (not (string=? "" composerPipes)) #{ \markup { \line { \instrumentPipes  } } #} )
-				$(if (not (string=? "" composerLyrics)) #{ \markup { \line { "Lyrics" } } #} )
 			}
 		}
 
@@ -46,4 +47,3 @@
 %	}
 %  }
 %}
-
diff --git a/template/pipes.full.ly b/template/pipes.full.ly
index b9dd49f..b57a44e 100644
--- a/template/pipes.full.ly
+++ b/template/pipes.full.ly
@@ -21,14 +21,14 @@
 		}
 		\new Staff = "seconds" {
 			\pipessecndglobal
-			\set Staff.instrumentName = \markup{ \instrumentPipes Seconds }
-			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes 2nd}
+			\set Staff.instrumentName = \markup{ \instrumentSecnd }
+			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentSecnd}
 			
 		}
 %		\new Staff = "thirds" {
 %			\pipesthrdglobal
-%			\set Staff.instrumentName = \markup{ \instrumentPipes Thirds }
-%			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes 3rd }
+%			\set Staff.instrumentName = \markup{ \instrumentPipes \instrumentThrd }
+%			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentThrd }
 %
 %		}
 	>>
diff --git a/template/pipes.seconds.ly b/template/pipes.seconds.ly
index 83ca709..78abdef 100644
--- a/template/pipes.seconds.ly
+++ b/template/pipes.seconds.ly
@@ -15,7 +15,7 @@
 	\header {
 		title = \title
 		meter = \meter
-		instrument = \instrumentPipes \instrumentSecnd
+		instrument = \instrumentSecnd
 		composer = \composerPipesSecnd
 	}
 }
@@ -28,7 +28,7 @@
 	\header {
 		title = \title
 		meter = \meter
-		instrument = \instrumentPipes \instrumentSecnd
+		instrument = \instrumentSecnd
 		composer = \composerPipesSecnd
 	}
 
diff --git a/template/pipes.thirds.ly b/template/pipes.thirds.ly
index dfe0b28..11623df 100644
--- a/template/pipes.thirds.ly
+++ b/template/pipes.thirds.ly
@@ -15,7 +15,7 @@
 	\header {
 		title = \title
 		meter = \meter
-		instrument = \instrumentPipesthrd
+		instrument = \instrumentThrd
 		composer = \composerPipesthrd
 	}
 }
@@ -28,7 +28,7 @@
 	\header {
 		title = \title
 		meter = \meter
-		instrument = \instrumentPipesthrd
+		instrument = \instrumentThrd
 		composer = \composerPipesthrd
 	}
 
diff --git a/todo b/todo
new file mode 100644
index 0000000..a67e6e4
--- /dev/null
+++ b/todo
@@ -0,0 +1,3 @@
+my home: tenor + bass
+mist covered mountains: bass
+loch duich: last bar side