diff --git a/4-4_marches/the_pikemans_march/bass.ly b/4-4_marches/the_pikemans_march/bass.ly
index b47602a..3671bf0 100644
--- a/4-4_marches/the_pikemans_march/bass.ly
+++ b/4-4_marches/the_pikemans_march/bass.ly
@@ -22,7 +22,7 @@
 			
 				\bassBA 
 				\bassBB
-				\bassBB
+				\bassBC r4
 			}
 		>>
 	}
diff --git a/4-4_marches/the_pikemans_march/drums.ly b/4-4_marches/the_pikemans_march/drums.ly
index 55d0e94..4036ace 100644
--- a/4-4_marches/the_pikemans_march/drums.ly
+++ b/4-4_marches/the_pikemans_march/drums.ly
@@ -16,12 +16,21 @@
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
 			<<
-				{ \repeat volta 2 { \part \line \break \line} \pageBreak
+				{
+					\repeat volta 2 { 
+						\part 
+						\line 
+						\break 
+						\line
+					} 
+					\pageBreak
+
 					\part \line \break
 					\line \break
 					\line \bar "|."
 				}
-				{	\snareAA
+				{	
+					\snareAA
 					\snareAB
 					s8
 
@@ -31,17 +40,6 @@
 				}
 			>>
 		}
-		\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 }
@@ -52,8 +50,20 @@
 
 			\tenorBA
 			\tenorBB
-			\tenorBC
+			\tenorBC r8 s
 		}
+		\new PipeBandDrumStaff = "bass" {
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+        
+			s8 \bassAA
+			\bassAB
+			
+			s8 \bassBA 
+			\bassBB
+			\bassBC r4
+		}
+
 	>>
 	\header {
 		title = \title
diff --git a/4-4_marches/the_pikemans_march/full.ly b/4-4_marches/the_pikemans_march/full.ly
new file mode 100644
index 0000000..d8f560e
--- /dev/null
+++ b/4-4_marches/the_pikemans_march/full.ly
@@ -0,0 +1,121 @@
+\version "2.19.0"
+
+\include "bagpipe.ly"
+\include "lilydrum.ly"
+
+\include "./config.ily"
+\include "./notes.bass.ily"
+\include "./notes.tenor.ily"
+\include "./notes.side.ily"
+\include "./notes.pipes.ily"
+%\include "./notes.pipes.seconds.ily"
+%\include "./notes.lyrics.ily"
+
+\score {
+	\new StaffGroup <<
+		\new Staff {
+			\global
+			\pipeglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentPipes }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentPipes }
+			<<
+				\new NullVoice = "format" {
+					\repeat volta 2 {
+						\part
+						\line \break
+						\line \break
+					}
+					\break
+					\part \line \break
+					\line \break
+					\line \break
+				}%Format
+
+				\new Voice = "pipes" {
+					\pipesA s8
+
+					\pipesBA
+					\pipesBB
+					\pipesBC
+				}%Pipes
+			>>
+		}
+%		\new Staff = "song" {
+%  			\lyricsglobal
+%			\new Voice = "lyrics" {
+%				
+%			}
+%		}
+%		\new Lyrics = "verse1" {
+%		  \lyricsglobal
+%		  \lyricsto "lyrics" {
+%			\verseA
+%		  }
+%		}
+%		\new Staff = "seconds" {
+%			\pipessecndglobal
+%			\set Staff.instrumentName = \markup{ \instrumentPipes \instrumentSecnd }
+%			\set Staff.shortInstrumentName = \markup{ \shortInstrumentPipes \shortInstrumentTrd}
+%
+%
+%		}
+		\new PipeBandDrumStaff = "side" {
+			\sideglobal
+			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
+
+					\snareAA
+					\snareAB s8
+
+					\snareBA
+					\snareBB
+					\snareBC s8
+		}
+		\new PipeBandDrumStaff = "tenor" {
+			\tenorglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentTenor }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentTenor }
+
+			\tenorAA
+			\tenorAB s8
+
+			\tenorBA
+			\tenorBB
+			\tenorBC r8 s
+		}
+		\new PipeBandDrumStaff = "bass" {
+			\bassglobal
+			\set PipeBandDrumStaff.instrumentName = \markup{ \instrumentBass }
+			\set PipeBandDrumStaff.shortInstrumentName = \markup{ \shortInstrumentBass}
+
+			s8 \bassAA
+			\bassAB
+			
+			s8 \bassBA 
+			\bassBB
+			\bassBC r4
+		}
+	>>
+	\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/4-4_marches/the_pikemans_march/notes.bass.ily b/4-4_marches/the_pikemans_march/notes.bass.ily
index b597be1..8b690c6 100644
--- a/4-4_marches/the_pikemans_march/notes.bass.ily
+++ b/4-4_marches/the_pikemans_march/notes.bass.ily
@@ -1,60 +1,54 @@
 % 4/4 The Pikeman's March
 % Bass
 \version "2.18.2"
-composerBass  = "E.T. de Boone, v0.1, 2016"
+composerBass = "E.T. de Boone, v0.7, 2016"
+arrangerBass = ""
 bassglobal = {}
 bassAA = \drummode {
-	d4
-	g4
-	r8 d8
-	g4
+	d4	g	r8 d	g4
 	|
-	d4
-	g4
-	d8[ g]
-	d4
+	d4	g	d8 g	d4
 	|
-	d4
-	g4
-	d4
-	g4
+	d4	g	d	g
 	|
-	d4
-	g4
-	d4
-	r4
+	d4	g	d	r
 }
 
 bassAB = \drummode {
-	d4
-	g4
-	r8 d8
-	g4
+	d4	g	r8 d	g4
 	|
-	d4
-	g4
-	d8[ g]
-	d4
+	d4	g	d8 g	d4
 	|
-	d4
-	r4
-	d4
-	r8 g8
+	d4	r	d	r8 g
 	|
-	d4
-	r8 g8
-	d4
-	r4
+	d4	r8 g	d4	r
 }
 
 bassBA = \drummode {
-	r1*4
+	d4	g	d	g
+	|
+	d4	r	r8 d	g4
+	|
+	d4	r	d	r
+	|
+	d4	g	d	d8\p\< g\!
 }
 bassBB = \drummode {
-	d8 g8
-	r4
-	d4
-	g4
+	d8\f g	r4	d\mf	g
 	|
-	r1*3
+	d4	r	r8 d	g4
+	|
+	d4	r	g	r
+	|
+	d4	g	d8 g	r4
+}
+bassBC = \drummode {
+	d8\f g	r4	d\mf	g
+	|
+	d4	r	r8 d	g4
+	|
+	d4	g	d	g
+	|
+	d4	g	d
+
 }
diff --git a/4-4_marches/the_pikemans_march/notes.side.ily b/4-4_marches/the_pikemans_march/notes.side.ily
index 5cf921e..0682741 100644
--- a/4-4_marches/the_pikemans_march/notes.side.ily
+++ b/4-4_marches/the_pikemans_march/notes.side.ily
@@ -1,7 +1,7 @@
 % 4/4 The Pikeman's March
 % Side
 \version "2.18.2"
-composerSide = "E.T. de Boone, v1.8, 2016"
+composerSide = "E.T. de Boone, v1.9, 2016"
 sideglobal = {
 	\eighthBeaming
 	}
@@ -76,9 +76,9 @@ snareBB = \drummode {
 	\flamd d8\f \flamg g8
 	r8 d8:32(
 	g16.) d32-> g16. g32
-	\flamd d8 d8:32(\dr
+	d4:32( \dr \<
 	|
-	g16.)\! g32 \flam d16. g32	d16. g32-> d32 g d g
+	d16.)\! g32 \flam d16. g32	d16. g32-> d32 g d g
 	\flam g8 \fr d8:32(
 	g16:64 g16) d16. g32
 	|
@@ -97,9 +97,9 @@ snareBC = \drummode {
 	\flamd d8\f \flamg g8
 	r8 d8:32(
 	g16.) d32-> g16. g32
-	\flamd d8 d8:32(
+	d4:32( \<
 	|
-	g16.)\! g32 \flam d16. g32	d16. g32-> d32 g d g
+	d16.)\! g32 \flam d16. g32	d16. g32-> d32 g d g
 	\flam g8 d8:32(
 	g16:64 g16) d16. g32
 	|
diff --git a/4-4_marches/the_pikemans_march/notes.side.v1.8.ily b/4-4_marches/the_pikemans_march/notes.side.v1.8.ily
new file mode 100644
index 0000000..5cf921e
--- /dev/null
+++ b/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)
+	r8 
+}
diff --git a/4-4_marches/the_pikemans_march/notes.tenor.ily b/4-4_marches/the_pikemans_march/notes.tenor.ily
index 16976fe..0269fc4 100644
--- a/4-4_marches/the_pikemans_march/notes.tenor.ily
+++ b/4-4_marches/the_pikemans_march/notes.tenor.ily
@@ -89,5 +89,4 @@ tenorBC = \drummode {
 	d4
 	d8^\markup{scoop} g
 	d4^\markup{end}
-	r4
 }