From d0da78c8a63b3f76e1927e7c6d27fe7b593d69c9 Mon Sep 17 00:00:00 2001
From: Buz Carter <buzcarter@hotmail.com>
Date: Sun, 20 Jan 2013 08:43:52 -0800
Subject: [PATCH] IE7 & 8 fixes; CSS changes -- using fewer generic tag rules
 opting for more class based; add '#' ChordPro comment support;

---
 Templates/ugs-song.dwt                        |  32 ++--
 ...y-little-grass-shack-in-kealakekua.cpm.txt |  10 +-
 css/ukeGeeks.music.css                        | 166 ++++++++++--------
 js/ukeGeeks.chordPainter.js                   |  14 +-
 js/ukeGeeks.cpmParser.js                      |   7 +-
 js/ukeGeeks.data.js                           |   6 +
 js/ukeGeeks.namespace.js                      |  14 +-
 js/ukeGeeks.scriptasaurus.js                  |  98 ++++++-----
 js/ukeGeeks.scriptasaurus.merged.js           | 130 ++++++++------
 js/ukeGeeks.scriptasaurus.min.js              |  27 +--
 js/ukeGeeks.toolsLite.js                      |   9 +
 readme.htm                                    |   8 +-
 song.php                                      |   2 +-
 songs/my-little-grass-shack-in-kealakekua.htm | 106 ++++++-----
 ugsphp/Ugs.php                                |   1 +
 ugsphp/builders/SongList_Vmb.php              |  28 +--
 ugsphp/builders/Song_Vmb.php                  |  82 +++++----
 ugsphp/builders/Source_Vmb.php                |  32 +---
 ugsphp/classes/FileHelper.php                 |  41 +++++
 19 files changed, 466 insertions(+), 347 deletions(-)
 create mode 100644 ugsphp/classes/FileHelper.php

diff --git a/Templates/ugs-song.dwt b/Templates/ugs-song.dwt
index c147077..a0a40fa 100644
--- a/Templates/ugs-song.dwt
+++ b/Templates/ugs-song.dwt
@@ -14,8 +14,8 @@ document.getElementsByTagName('html')[0].className = 'ie';
 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <script type="text/javascript" src="../js/excanvas.js"></script>
 <![endif]-->
-	<link rel="stylesheet" type="text/css" href="../css/yuiReset.css" />
-	<link rel="stylesheet" type="text/css" href="../css/basic-page-layout.css" media="all" />
+<link rel="stylesheet" type="text/css" href="../css/yuiReset.css" />
+<link rel="stylesheet" type="text/css" href="../css/basic-page-layout.css" media="all" />
 <link rel="stylesheet" type="text/css" href="../css/ukeGeeks.music.css" media="all" />
 <link rel="stylesheet" type="text/css" href="../css/ukeGeeks.musicPrint.css" media="print" />
 <!-- meta UkeGeek beta .5 -->
@@ -29,7 +29,7 @@ document.getElementsByTagName('html')[0].className = 'ie';
 			<h1>UNTITLED</h1>
 			<h2>ARTIST</h2>
 			<!-- TemplateEndEditable -->
-		</hgroup>
+	</hgroup>
 	</header>
 	<div class="metaInfo"> <!-- TemplateBeginEditable name="metaInfo" -->
 		<p>Source: NA</p>
@@ -37,22 +37,22 @@ document.getElementsByTagName('html')[0].className = 'ie';
 		<!-- TemplateEndEditable -->
 	</div>
 	<!--/.metaInfo-->
-		<div id="ukeSongContainer" class="ugsLayoutTwoColumn ">
-			<aside id="ukeChordsCanvas" class="ugs-diagrams-wrap ugs-grouped">
-		<canvas>
-			<p>Your browser doesn't support canvas please upgrade (FREE) to <a href="http://www.google.com/chrome">Google Chrome</a>, <a href="http://www.mozilla.com/en-US/firefox/">Firefox</a>, or <a href="http://www.apple.com/safari/">Apple Safari</a>.</p>
-		</canvas>
-	</aside>
-			<article id="ukeSongText" class="ugs-source-wrap">
-		<pre>
-		<!-- TemplateBeginEditable name="ezChords" -->
+	<div id="ukeSongContainer" class="ugsLayoutTwoColumn ugs-song-wrap">
+		<aside id="ukeChordsCanvas" class="ugs-diagrams-wrap ugs-grouped">
+			<canvas>
+				<p>Your browser doesn't support canvas please upgrade (FREE) to <a href="http://www.google.com/chrome">Google Chrome</a>, <a href="http://www.mozilla.com/en-US/firefox/">Firefox</a>, or <a href="http://www.apple.com/safari/">Apple Safari</a>.</p>
+			</canvas>
+		</aside>
+		<article id="ukeSongText" class="ugs-source-wrap">
+			<pre>
+<!-- TemplateBeginEditable name="ezChords" -->
 Paste [Am]your marked-up song[C]
 Here... [F]
-		<!-- TemplateEndEditable --> 
+<!-- TemplateEndEditable --> 
 		</pre>
-	</article>
-		</div>
-		<!-- /#ukeSongContainer -->
+		</article>
+	</div>
+	<!-- /#ukeSongContainer -->
 </section>
 <footer>
 	<p>Note: Standard <strong>GCEA</strong> Soprano Ukulele Tuning. <small>Powered by <a href="http://ukegeeks.com/" title="Uke Geeks for free ukulele JavaScript tools">UkeGeeks' Scriptasaurus</a> &bull; ukegeeks.com</small></p>
diff --git a/cpm/my-little-grass-shack-in-kealakekua.cpm.txt b/cpm/my-little-grass-shack-in-kealakekua.cpm.txt
index 70cb0e4..5247333 100644
--- a/cpm/my-little-grass-shack-in-kealakekua.cpm.txt
+++ b/cpm/my-little-grass-shack-in-kealakekua.cpm.txt
@@ -1,28 +1,32 @@
 {title:My Little Grass Shack in Kealakekua}
-{subtitle:Lyrics &amp; Music: Bill Cogswell, Tommy Harrison and Johnny Noble &copy; 1933}
+{artist:Lyrics &amp; Music: Bill Cogswell, Tommy Harrison and Johnny Noble &copy; 1933}
 
+{c:Verse 1}
 I want to go [G]back to my little grass shack
 In Kealakekua, [A7]Hawaii
 I want to [D7]be with all the kanes and wahines
 That I used to [G]know... so long ago
-
 I can [B7]hear the old guitars a-playing[E7]
 On the beach at Honaunau
 I can [A7]hear the old Hawaiians saying
 &quot;Komo [D7]mai no kaua i ka hale welakahau&quot;
 
+{c:Verse 2}
 It won't be [G]long till my ship will be sailing
 Back to [A7]Kona
 A [D7]grand old place
 That's always fair to [B7]see... you're telling me
-
 I'm [E7]just a little Hawaiian and a homesick island boy
 I [A7]want to go back to my fish and poi
 
+{start_of_chorus}
+{c:Chorus}
 I want to go [G]back to my little grass shack
 In Kealakekua, [A7]Hawaii
 Where the [D7]humu-humu nuku-nuku a pua'a
 Go swimming [G]by
+{end_of_chorus}
 
+{c:Outro}
 Where the [D7]humu-humu nuku-nuku a pua'a
 Go swimming [G]by
diff --git a/css/ukeGeeks.music.css b/css/ukeGeeks.music.css
index b83d3b2..e0e5107 100644
--- a/css/ukeGeeks.music.css
+++ b/css/ukeGeeks.music.css
@@ -8,16 +8,16 @@
 
 /* need to do a STRONG-ish reset (override WP theme)
 */
-.ugs-song-wrap{
+.ugs-song-wrap {
 	font-size: 100%;
 }
-.ugs-song-wrap,
-.ugs-song-wrap h5,
-.ugs-song-wrap h6,
-.ugs-song-wrap pre,
-.ugs-song-wrap code,
-.ugs-song-wrap strong,
-.ugs-song-wrap em{
+.ugs-song-wrap, 
+.ugs-song-wrap h5, 
+.ugs-song-wrap h6, 
+.ugs-song-wrap pre, 
+.ugs-song-wrap code, 
+.ugs-song-wrap strong, 
+.ugs-song-wrap em {
 	font-family:inherit;
 	font-weight:normal;
 	font-size: inherit;
@@ -36,32 +36,45 @@
 */
 
 /* old skool clearfix */
-.ugs-grouped:after { content: "."; display: block; clear: both; visibility: hidden; line-height: 0; height: 0; }
-.ugs-grouped { display: block; }
-.ugs-grouped { .display: inline-block; }
-.ie8 .ugs-grouped { display: block; }
-* html .ugs-grouped { height: 1%; }
-
+.ugs-grouped:after {
+	content: ".";
+	display: block;
+	clear: both;
+	visibility: hidden;
+	line-height: 0;
+	height: 0;
+}
+.ugs-grouped {
+	display: block;
+}
+.ugs-grouped {
+.display: inline-block;
+}
+.ie8 .ugs-grouped {
+	display: block;
+}
+* html .ugs-grouped {
+	height: 1%;
+}
 /* LAYOUT (2-COLUMNS)
   ------------------------------ */
-.ugsLayoutTwoColumn aside{
+.ugsLayoutTwoColumn .ugs-diagrams-wrap {
 	float:left;
 	width:225px;
 }
-.ugsLayoutTwoColumn article{
+.ugsLayoutTwoColumn .ugs-source-wrap {
 	margin-left:250px;
 }
-
 /* CHORD CANVAS (BLOCKS)
   ------------------------------ */
-.ugs-diagrams-wrap canvas{
+.ugs-diagrams-wrap canvas {
 	float:left;
 	margin-right:5px;
 }
 /* 
   ------------------------------ */
-.ugs-source-wrap h5,
-.ugs-source-wrap h6{
+.ugs-source-wrap h5, 
+.ugs-source-wrap h6 {
 	border-left:solid .5em #CCC;
 	color:#036;
 	font-family:Georgia, "Times New Roman", Times, serif;
@@ -72,55 +85,58 @@
 	padding:.2em 0;
 	text-indent:2.3em;
 }
-.ugs-source-wrap h6{
+.ugs-source-wrap h6 {
 	font-size:.9em;
 }
-.ugs-source-wrap h5 + h6{
+.ugs-source-wrap h5 + h6 {
 	margin-top:-1em;
 }
-.ugs-source-wrap pre{
+.ugs-source-wrap pre {
 	color:#333;
 	font-family:inherit;
 	padding-top:0.4em;
 	white-space:pre;
 }
-.ugs-source-wrap pre + h6 {margin-top: 3.5em;}
-.ie .ugs-source-wrap pre{
+.ugs-source-wrap pre + h6 {
+	margin-top: 3.5em;
+}
+.ie .ugs-source-wrap pre {
 	font-family:Verdana, Arial, Helvetica, sans-serif;
 }
 /* CHORUS BLOCK
   ------------------------------ */
-.ugs-song-wrap .ugsChorus{
+.ugs-song-wrap .ugsChorus {
 	border-left:solid 3px #ddd;
 	margin:1em 0 2.3em;
 }
-.ugsChorus pre{
+.ugsChorus pre {
 	margin-left:1em;
 }
-.ie .ugsChorus h6,
-.ugsChorus > h6{
+.ie .ugsChorus h6, 
+.ugsChorus > h6 {
 	font-size:1.2em;
 	text-indent:.4em;
 }
-.ugs-song-wrap pre + .ugsChorus{margin-top:3.5em;}
-
+.ugs-song-wrap pre + .ugsChorus {
+	margin-top:3.5em;
+}
 /* TABS
   ------------------------------ */
-.ugs-song-wrap .ugsTabs{
+.ugs-song-wrap .ugsTabs {
 	margin:0;
 	padding:0;
 }
-.ugs-song-wrap .ugsTabs + .ugsPlain{
+.ugs-song-wrap .ugsTabs + .ugsPlain {
 	margin:0 0 1em;
 	padding:0;
 }
 /* PLACE CHORDS ABOVE TEXT
   ------------------------------ */
-.ugs-song-wrap .ugsChords{
+.ugs-song-wrap .ugsChords {
 	line-height:3;
 }
-.ugsChords code{
-	color:#eaeaea;
+.ugsChords code {
+	color:#efefef;
 	display:inline-block; /* WebKit bug */
 	/* height:1.2em; /* WebKit bug */
 	font-family:Verdana, Arial, Helvetica, sans-serif;
@@ -129,121 +145,125 @@
 	position:relative;
 	vertical-align: middle;/* now fix the fix for Firefox */
 }
-.ugsInline .ugsChords code{
+.ugsInline .ugsChords code {
+	color:#f2f2f2;
 	display: inline;
 	vertical-align: inherit;
 }
-.ugsChords code strong{
+.ugsChords code strong {
 	left:-4px;
 	position:absolute;
 	top:-2em;
 }
-.ugsChords code em{
+.ugsChords code em {
 	color:#d20;
 	margin:0 -3px;
 }
-.ie .ugsChords{
+.ie .ugsChords {
 	line-height:2.6;
 }
-.ie code strong,
-.ie code em{
+.ie code strong, 
+.ie code em {
 	font-weight:normal;
 	font-style:normal;
 }
 /* SHOW CHORD NAMES INLINE
   ------------------------------ */
 .ugs-song-wrap .ugsInline,
-.ugs-song-wrap .ugsInline pre{
+.ugs-song-wrap .ugsInline pre,
+.ugs-song-wrap.ugsInline pre /* added for Editor Plus -- required? */
+{
 	line-height:1.8;
 }
-.ugsInline code{
+.ugsInline code {
 	padding-left:.1em;
 }
-.ugsInline code strong{
+.ugsInline code strong {
 	position:relative;
 	top:auto;
 	left:auto;
 }
-
 /* PLAIN (lyrics only) Blocks
   ------------------------------ */
-.ugsPlain + h6{
+.ugsPlain + h6 {
 	margin-top:1.5em;
 }
-
 /* CHORD-ONLY (NO LYRICS) BLOCKS
   ------------------------------ */
 .ugs-song-wrap .ugsNoLyrics {
 	line-height:2;
 	padding:0 0 1.2em;
 }
-.ugsNoLyrics + h6{ 
+.ugsNoLyrics + h6 {
 	margin-top:.5em;
 }
-.ugsNoLyrics code{
+.ugsNoLyrics code {
 	height:auto;
 	vertical-align: baseline;
 }
-.ugsNoLyrics code strong{
+.ugsNoLyrics code strong {
 	position:relative;
 	top:auto;
 	left:auto;
 }
-
 /* CHORD-ONLY (NO LYRICS) BLOCKS
   ------------------------------ */
-.ugsNoChords aside{
+.ugsNoChords aside {
 	display: none;
 }
-.ugsNoChords article{
+.ugsNoChords article {
 	margin-left: 0;
 }
-
 /* SHOW CHORD DIAGRAMS INLINE
   ------------------------------ */
-.ugsInlineDiagrams .ugsChords{
+.ugsInlineDiagrams .ugsChords {
 	line-height:95px;
 }
-.ugsInlineDiagrams .ugsNoLyrics code{
+.ugsInlineDiagrams .ugsNoLyrics code {
 	vertical-align: text-top;
 }
-.ugsInlineDiagrams .ugsNoLyrics strong{
+.ugsInlineDiagrams .ugsNoLyrics strong {
 	position: absolute;
 }
-.ugsInlineDiagrams .ugsChords + .ugsPlain{
+.ugsInlineDiagrams .ugsChords + .ugsPlain {
 	padding-bottom: 40px;
 }
-.ugsInlineDiagrams h6 + .ugsChords{
+.ugsInlineDiagrams h6 + .ugsChords {
 	padding-top: 20px;
 }
-.ugsInlineDiagrams code{
+.ugsInlineDiagrams code {
 	font-size:.8em;
 	font-weight:normal;
 }
-.ugsInlineDiagrams .ugsChords code strong{
+.ugsInlineDiagrams .ugsChords code strong {
 	left:0;
 	line-height:1;
 	text-align:center;
-	top:-70px;
+	top:-72px;
 	width:30px;
 }
-.ugsChords code canvas{
+.ugsChords code canvas {
 	left:0;
 	position:absolute;
-	top:-54px;
+	top:-60px;
 }
 /* TODO: problem with packing */
-.ugs-song-wrap .ugsInlineSpacer{
+.ugs-song-wrap .ugsInlineSpacer {
 	display:inline-block;
 	line-height:1px;
 	width:40px;
 }
-
-
 /* Multi-Column Layouts
   ------------------------------ */
-.ugsWrap .ugsColumn{ float:left; }
-.ugsColumnCount2 .ugsColumn{ width: 49.5%; }
-.ugsColumnCount3 .ugsColumn{ width: 32.5%; }
-.ugsColumnCount4 .ugsColumn{ width: 24.5%; }
-
+.ugsWrap .ugsColumn {
+	float:left;
+}
+.ugsColumnCount2 .ugsColumn {
+	width: 49.5%;
+}
+.ugsColumnCount3 .ugsColumn {
+	width: 32.5%;
+}
+.ugsColumnCount4 .ugsColumn {
+	width: 24.5%;
+}
diff --git a/js/ukeGeeks.chordPainter.js b/js/ukeGeeks.chordPainter.js
index 2d094ff..33d8e30 100644
--- a/js/ukeGeeks.chordPainter.js
+++ b/js/ukeGeeks.chordPainter.js
@@ -22,18 +22,18 @@ ukeGeeks.chordPainter.prototype = {
 	 */
 	errors: [],
 
-	nodes: null,
+	handles: null,
 	
 	/**
 	 * Again this is a constructor replacement
 	 * @method init
-	 * @param domNodes {domObject} DOM Element object 
+	 * @param handles {ukeGeeks.data.htmlHandles} DOM Element object 
 	 * @return {void}
 	 */
-	init: function(domNodes){
+	init: function(handles){
 		this.brush = new ukeGeeks.chordBrush;
 		this.brush.init();
-		this.nodes = domNodes;
+		this.handles = handles;
 	},
 	
 	/**
@@ -43,7 +43,7 @@ ukeGeeks.chordPainter.prototype = {
 	 * @return {void}
 	 */
 	show: function(chords){
-		this.nodes.diagrams.innerHTML = '';
+		this.handles.diagrams.innerHTML = '';
 		this.errors = [];
 		for (var i=0; i < chords.length; i++){
 			var c = ukeGeeks.definitions.get(chords[i]);
@@ -51,7 +51,7 @@ ukeGeeks.chordPainter.prototype = {
 				this.errors.push(chords[i]);
 				continue;
 			}
-			this.brush.plot(this.nodes.diagrams,c,ukeGeeks.settings.fretBox);
+			this.brush.plot(this.handles.diagrams,c,ukeGeeks.settings.fretBox);
 		}
 	},
 
@@ -63,7 +63,7 @@ ukeGeeks.chordPainter.prototype = {
 	 * @return {void}
 	 */
 	showInline: function (chords){
-		var e = this.nodes.text.getElementsByTagName('code');
+		var e = this.handles.text.getElementsByTagName('code');
 		if (e.length < 1) return;
 		for (var i=0; i < chords.length; i++){
 			var c = ukeGeeks.definitions.get(chords[i]);
diff --git a/js/ukeGeeks.cpmParser.js b/js/ukeGeeks.cpmParser.js
index eae3d3b..0dbd314 100644
--- a/js/ukeGeeks.cpmParser.js
+++ b/js/ukeGeeks.cpmParser.js
@@ -275,6 +275,10 @@ ukeGeeks.cpmParser.prototype = {
 		var tmpBlk = null;
 		var isMarker; // block marker
 		for (var i in lines){
+			// strip comments
+			if ((lines[i].length > 0) && (lines[i][0] == '#')){
+				continue;
+			}
 			isMarker = this.regEx.blocks.test(lines[i]);
 			if (isMarker || tmpBlk == null){
 				// save last block, start new one...
@@ -320,13 +324,14 @@ ukeGeeks.cpmParser.prototype = {
 		var regEx = {
 			instr : /\{[^}]+?:.*?\}/im,
 			cmdArgs : /\{.+?:(.*)\}/gi,
-			cmdVerb : /\{(.+?):.*\}/gi
+			cmdVerb : /\{(.+?)\s*:.*\}/gi
 		};
 		for (var i in song){
 			for (var j in song[i].lines){
 				if (regEx.instr.test(song[i].lines[j])){
 					var args = song[i].lines[j].replace(regEx.cmdArgs,'$1');
 					var verb = song[i].lines[j].replace(regEx.cmdVerb,'$1').toLowerCase();
+					verb = verb.replace(/\r/, ''); // IE7 bug
 					var tmpBlk = {
 						type: '',
 						lines : []
diff --git a/js/ukeGeeks.data.js b/js/ukeGeeks.data.js
index 453b1aa..7c8903f 100644
--- a/js/ukeGeeks.data.js
+++ b/js/ukeGeeks.data.js
@@ -124,6 +124,12 @@ ukeGeeks.data = new function(){
 		this.chords = chords;
 	};
 	
+	this.htmlHandles = function(wrap, diagrams, text){
+		this.wrap = wrap;
+		this.diagrams = diagrams;
+		this.text = text;
+	};
+	
 // -----------------------------------------------------------------------------------------
 // *** DOCUMENTAION ONLY ***
 // -----------------------------------------------------------------------------------------
diff --git a/js/ukeGeeks.namespace.js b/js/ukeGeeks.namespace.js
index f070f40..48d730b 100644
--- a/js/ukeGeeks.namespace.js
+++ b/js/ukeGeeks.namespace.js
@@ -1,21 +1,21 @@
 /**
   * <ul>
   * <li>Project: UkeGeeks' Scriptasaurus</li>
-	* <li>Version: 1.2</li>
+  * <li>Version: 1.2</li>
   * <li>Homepage: http://ukegeeks.com</li>
   * <li>Author: Buz Carter</li>
   * <li>Contact: buz@ukegeeks.com</li>
-	* <li>Copyright: Copyright 2010 Buz Carter.</li>
-	* <li>License GNU General Public License (http://www.gnu.org/licenses/gpl.html)</li>
-	* <ul>
+  * <li>Copyright: Copyright 2010 Buz Carter.</li>
+  * <li>License GNU General Public License (http://www.gnu.org/licenses/gpl.html)</li>
+  * <ul>
   * 	
   * <p>== Overview
   * <p>Reads marked-up music (lyrics + chords) extracting all of the chords used;
   * Generates a chord diagrams using HTML5 <canvas> and rewrites the music with
   * standard HTML wrapping the chords.
-	*
-	* @module  scriptasaurus
+  *
+  * @module  scriptasaurus
   * @namespace  ukeGeeks
-	* 
+  * 
   */
 var ukeGeeks = window.ukeGeeks||{};
diff --git a/js/ukeGeeks.scriptasaurus.js b/js/ukeGeeks.scriptasaurus.js
index 2196a72..5c2e680 100644
--- a/js/ukeGeeks.scriptasaurus.js
+++ b/js/ukeGeeks.scriptasaurus.js
@@ -17,7 +17,7 @@ ukeGeeks.scriptasaurus = new function(){
 		ukeGeeks.settings.environment.isIe = isIeFamily;
 		ukeGeeks.definitions.useInstrument(ukeGeeks.definitions.instrument.sopranoUke);
 	};
-	
+
 	/**
 	 * Runs all Scriptasaurus methods using the element Ids defined in the settings class. 
 	 * This is your "Do All". See data.song for structure.
@@ -26,11 +26,14 @@ ukeGeeks.scriptasaurus = new function(){
 	 */
 	this.run = function(){
 		//console.log('run (Classic Mode)');
-		var node = _makeNodeById();
-		if (!node.diagrams || !node.text || !node.wrap) {
+		var handles = _getHandlesFromId();
+		if (!handles || !handles.diagrams || !handles.text || !handles.wrap) {
 			return null;
 		}
-		return _runSong(node);
+		_errList = [];
+		var song = _runSong(handles);
+		showErrors(_errList[0]);
+		return song;
 	};
 	
 	/**
@@ -39,23 +42,18 @@ ukeGeeks.scriptasaurus = new function(){
 	 * @return {Array of songObject}
 	 */
 	this.runByClasses = function(){
-		//console.log('runByClasses');
 		var songs = [];
 		var songWraps = ukeGeeks.toolsLite.getElementsByClass(ukeGeeks.settings.wrapClasses.wrap);
-		//console.log(songWraps);
 		for(var i = 0; i < songWraps.length; i++){
-			//console.log('running loop: '+ i);
-			var node = _makeNodeByClass(songWraps[i]);
-			if (node == null){
-				//console.log('problem with nodes');
+			var handles = _getHandlesFromClass(songWraps[i]);
+			if (handles == null){
 				continue;
 			}
-			//addCanvas(preTags[i]);
-			songs.push(_runSong(node));
+			songs.push(_runSong(handles));
 		}
 		return songs;
 	};
-
+	
 	/**
 	 * Is this really nececessary?
 	 * @method setTuningOffset
@@ -65,46 +63,49 @@ ukeGeeks.scriptasaurus = new function(){
 		ukeGeeks.definitions.useInstrument(offset);
 	};
 	
+	var _errList = [];
+	// song
 	
 	/**
 	 * 
 	 * @method _runSong
 	 * @private
-	 * @param node {nodeobjc} 
+	 * @param handles {ukeGeeks.data.htmlHandles}
+	 * @return {songObj}
 	 */
-	var _runSong = function(nodes){
+	var _runSong = function(handles){
 		// console.log('run Song');
 		
 		// read Music, find chords, generate HTML version of song:
 		var cpm = new ukeGeeks.cpmParser;
 		cpm.init();
-		var song = cpm.parse(nodes.text.innerHTML);
+		var song = cpm.parse(handles.text.innerHTML);
 		ukeGeeks.definitions.replace(song.defs);
 	
 		var chrdPrsr = new ukeGeeks.chordParser;
 		chrdPrsr.init();
-		nodes.text.innerHTML = chrdPrsr.parse(song.body);
+		handles.text.innerHTML = chrdPrsr.parse(song.body);
 		var chordsInUse = chrdPrsr.getChords();
 	
 		// Draw the Chord Diagrams:
 		var painter = new ukeGeeks.chordPainter;
-		painter.init(nodes);
+		painter.init(handles);
 		painter.show(chordsInUse);
 		// Show chord diagrams inline with lyrics
 		if (ukeGeeks.settings.inlineDiagrams){
-			ukeGeeks.toolsLite.addClass(nodes.wrap, 'ugsInlineDiagrams');
+			ukeGeeks.toolsLite.addClass(handles.wrap, 'ugsInlineDiagrams');
 			painter.showInline(chordsInUse);
 		}
 	
 		// Do Tablature:
 		var tabs = new ukeGeeks.tabs;
 		tabs.init();
-		tabs.replace(nodes.text);
+		tabs.replace(handles.text);
 		
 		// error reporting:
-		//showErrors(painter.getErrors());
+		_errList.push(painter.getErrors());
 		
-		var container = nodes.wrap;
+		var container = handles.wrap;
 		if (container){
 			if (!song.hasChords){
 				ukeGeeks.toolsLite.addClass(container, 'ugsNoChords');
@@ -117,41 +118,54 @@ ukeGeeks.scriptasaurus = new function(){
 		// done!
 		return song;
 	};
+
+	/**
+	 * Shows a JavaScript alert box containing list of unknown chords.
+	 * @method showErrors
+	 * @return {void}
+	 */
+	var showErrors = function(errs){
+		if (errs.length < 1) {
+			return;
+		}
+		
+		console.log(typeof(errs[0]));
+		var s = '';
+		for(var i = 0; i < errs.length; i++){
+			s += (s.length > 0) ? ', ' : '';
+			s += errs[i];
+		}
+		alert('Forgive me, but I don\'t know the following chords: ' + s);
+	};
 	
 	/**
 	 * 
-	 * @method _makeNodeByClass
+	 * @method _getHandlesFromClass
 	 * @private
 	 * @param wrap {domElement} 
+	 * @retuns {ukeGeeks.data.htmlHandles} 
 	 */
-	var _makeNodeByClass = function(wrap){
+	var _getHandlesFromClass = function(wrap){
 		var diagrams = ukeGeeks.toolsLite.getElementsByClass(ukeGeeks.settings.wrapClasses.diagrams, wrap);
 		var text = ukeGeeks.toolsLite.getElementsByClass(ukeGeeks.settings.wrapClasses.text, wrap);
 		if ((diagrams == undefined) || (diagrams.length < 1) || (text == undefined) || (text.length < 1)){
 			return null;
 		}
-		var node = 
-		{
-			wrap : wrap,
-			diagrams : diagrams[0],
-			text : text[0]
-		};
-		return node;
+		return new ukeGeeks.data.htmlHandles(wrap, diagrams[0], text[0]);
 	};
 
 	/**
 	 * 
-	 * @method _makeNodeById
+	 * @method _getHandlesFromId
 	 * @private
-	 * @param node {nodeobjc} 
+	 * @retuns {ukeGeeks.data.htmlHandles} 
 	 */
-	var _makeNodeById = function(){
-		var node = 
-		{
-			wrap : document.getElementById(ukeGeeks.settings.ids.container),
-			diagrams : document.getElementById(ukeGeeks.settings.ids.canvas),
-			text : document.getElementById(ukeGeeks.settings.ids.songText)
-		};
-		return node;
-	}
+	var _getHandlesFromId = function(){
+		return new ukeGeeks.data.htmlHandles(
+			document.getElementById(ukeGeeks.settings.ids.container),
+			document.getElementById(ukeGeeks.settings.ids.canvas),
+			document.getElementById(ukeGeeks.settings.ids.songText)
+		);
+	};
+	
 }
diff --git a/js/ukeGeeks.scriptasaurus.merged.js b/js/ukeGeeks.scriptasaurus.merged.js
index cf01d36..6a9c61f 100644
--- a/js/ukeGeeks.scriptasaurus.merged.js
+++ b/js/ukeGeeks.scriptasaurus.merged.js
@@ -417,6 +417,12 @@ ukeGeeks.data = new function(){
 		this.chords = chords;
 	};
 	
+	this.htmlHandles = function(wrap, diagrams, text){
+		this.wrap = wrap;
+		this.diagrams = diagrams;
+		this.text = text;
+	};
+	
 // -----------------------------------------------------------------------------------------
 // *** DOCUMENTAION ONLY ***
 // -----------------------------------------------------------------------------------------
@@ -499,6 +505,15 @@ ukeGeeks.toolsLite = new function(){
 		}
 	};
 	
+	this.setClass = function(element, className, isActive) {
+		if (isActive){
+			this.addClass(element, className);
+		}
+		else{
+			this.removeClass(element, className);
+		}
+	};
+
 	var getRegEx = function(className){
 		return new RegExp('(\\s|^)'+className+'(\\s|$)');
 	};
@@ -2058,13 +2073,14 @@ ukeGeeks.cpmParser.prototype = {
 		var regEx = {
 			instr : /\{[^}]+?:.*?\}/im,
 			cmdArgs : /\{.+?:(.*)\}/gi,
-			cmdVerb : /\{(.+?):.*\}/gi
+			cmdVerb : /\{(.+?)\s*:.*\}/gi
 		};
 		for (var i in song){
 			for (var j in song[i].lines){
 				if (regEx.instr.test(song[i].lines[j])){
 					var args = song[i].lines[j].replace(regEx.cmdArgs,'$1');
 					var verb = song[i].lines[j].replace(regEx.cmdVerb,'$1').toLowerCase();
+					verb = verb.replace(/\r/, ''); // IE7 bug
 					var tmpBlk = {
 						type: '',
 						lines : []
@@ -2235,18 +2251,18 @@ ukeGeeks.chordPainter.prototype = {
 	 */
 	errors: [],
 
-	nodes: null,
+	handles: null,
 	
 	/**
 	 * Again this is a constructor replacement
 	 * @method init
-	 * @param domNodes {domObject} DOM Element object 
+	 * @param handles {ukeGeeks.data.htmlHandles} DOM Element object 
 	 * @return {void}
 	 */
-	init: function(domNodes){
+	init: function(handles){
 		this.brush = new ukeGeeks.chordBrush;
 		this.brush.init();
-		this.nodes = domNodes;
+		this.handles = handles;
 	},
 	
 	/**
@@ -2256,7 +2272,7 @@ ukeGeeks.chordPainter.prototype = {
 	 * @return {void}
 	 */
 	show: function(chords){
-		this.nodes.diagrams.innerHTML = '';
+		this.handles.diagrams.innerHTML = '';
 		this.errors = [];
 		for (var i=0; i < chords.length; i++){
 			var c = ukeGeeks.definitions.get(chords[i]);
@@ -2264,7 +2280,7 @@ ukeGeeks.chordPainter.prototype = {
 				this.errors.push(chords[i]);
 				continue;
 			}
-			this.brush.plot(this.nodes.diagrams,c,ukeGeeks.settings.fretBox);
+			this.brush.plot(this.handles.diagrams,c,ukeGeeks.settings.fretBox);
 		}
 	},
 
@@ -2276,7 +2292,7 @@ ukeGeeks.chordPainter.prototype = {
 	 * @return {void}
 	 */
 	showInline: function (chords){
-		var e = this.nodes.text.getElementsByTagName('code');
+		var e = this.handles.text.getElementsByTagName('code');
 		if (e.length < 1) return;
 		for (var i=0; i < chords.length; i++){
 			var c = ukeGeeks.definitions.get(chords[i]);
@@ -2725,11 +2741,14 @@ ukeGeeks.scriptasaurus = new function(){
 	 */
 	this.run = function(){
 		//console.log('run (Classic Mode)');
-		var node = _makeNodeById();
-		if (!node.diagrams || !node.text || !node.wrap) {
+		var handles = _getHandlesFromId();
+		if (!handles || !handles.diagrams || !handles.text || !handles.wrap) {
 			return null;
 		}
-		return _runSong(node);
+		_errList = [];
+		var song = _runSong(handles);
+		showErrors(_errList[0]);
+		return song;
 	};
 	
 	/**
@@ -2738,19 +2757,14 @@ ukeGeeks.scriptasaurus = new function(){
 	 * @return {Array of songObject}
 	 */
 	this.runByClasses = function(){
-		//console.log('runByClasses');
 		var songs = [];
 		var songWraps = ukeGeeks.toolsLite.getElementsByClass(ukeGeeks.settings.wrapClasses.wrap);
-		//console.log(songWraps);
 		for(var i = 0; i < songWraps.length; i++){
-			//console.log('running loop: '+ i);
-			var node = _makeNodeByClass(songWraps[i]);
-			if (node == null){
-				//console.log('problem with nodes');
+			var handles = _getHandlesFromClass(songWraps[i]);
+			if (handles == null){
 				continue;
 			}
-			//addCanvas(preTags[i]);
-			songs.push(_runSong(node));
+			songs.push(_runSong(handles));
 		}
 		return songs;
 	};
@@ -2764,46 +2778,49 @@ ukeGeeks.scriptasaurus = new function(){
 		ukeGeeks.definitions.useInstrument(offset);
 	};
 	
+	var _errList = [];
+	// song
 	
 	/**
 	 * 
 	 * @method _runSong
 	 * @private
-	 * @param node {nodeobjc} 
+	 * @param handles {ukeGeeks.data.htmlHandles}
+	 * @return {songObj}
 	 */
-	var _runSong = function(nodes){
+	var _runSong = function(handles){
 		// console.log('run Song');
 		
 		// read Music, find chords, generate HTML version of song:
 		var cpm = new ukeGeeks.cpmParser;
 		cpm.init();
-		var song = cpm.parse(nodes.text.innerHTML);
+		var song = cpm.parse(handles.text.innerHTML);
 		ukeGeeks.definitions.replace(song.defs);
 	
 		var chrdPrsr = new ukeGeeks.chordParser;
 		chrdPrsr.init();
-		nodes.text.innerHTML = chrdPrsr.parse(song.body);
+		handles.text.innerHTML = chrdPrsr.parse(song.body);
 		var chordsInUse = chrdPrsr.getChords();
 	
 		// Draw the Chord Diagrams:
 		var painter = new ukeGeeks.chordPainter;
-		painter.init(nodes);
+		painter.init(handles);
 		painter.show(chordsInUse);
 		// Show chord diagrams inline with lyrics
 		if (ukeGeeks.settings.inlineDiagrams){
-			ukeGeeks.toolsLite.addClass(nodes.wrap, 'ugsInlineDiagrams');
+			ukeGeeks.toolsLite.addClass(handles.wrap, 'ugsInlineDiagrams');
 			painter.showInline(chordsInUse);
 		}
 	
 		// Do Tablature:
 		var tabs = new ukeGeeks.tabs;
 		tabs.init();
-		tabs.replace(nodes.text);
+		tabs.replace(handles.text);
 		
 		// error reporting:
-		//showErrors(painter.getErrors());
+		_errList.push(painter.getErrors());
 		
-		var container = nodes.wrap;
+		var container = handles.wrap;
 		if (container){
 			if (!song.hasChords){
 				ukeGeeks.toolsLite.addClass(container, 'ugsNoChords');
@@ -2817,40 +2834,53 @@ ukeGeeks.scriptasaurus = new function(){
 		return song;
 	};
 
+	/**
+	 * Shows a JavaScript alert box containing list of unknown chords.
+	 * @method showErrors
+	 * @return {void}
+	 */
+	var showErrors = function(errs){
+		if (errs.length < 1) {
+			return;
+		}
+		
+		console.log(typeof(errs[0]));
+		var s = '';
+		for(var i = 0; i < errs.length; i++){
+			s += (s.length > 0) ? ', ' : '';
+			s += errs[i];
+		}
+		alert('Forgive me, but I don\'t know the following chords: ' + s);
+	};
+	
 	/**
 	 * 
-	 * @method _makeNodeByClass
+	 * @method _getHandlesFromClass
 	 * @private
 	 * @param wrap {domElement} 
+	 * @retuns {ukeGeeks.data.htmlHandles} 
 	 */
-	var _makeNodeByClass = function(wrap){
+	var _getHandlesFromClass = function(wrap){
 		var diagrams = ukeGeeks.toolsLite.getElementsByClass(ukeGeeks.settings.wrapClasses.diagrams, wrap);
 		var text = ukeGeeks.toolsLite.getElementsByClass(ukeGeeks.settings.wrapClasses.text, wrap);
 		if ((diagrams == undefined) || (diagrams.length < 1) || (text == undefined) || (text.length < 1)){
 			return null;
-			}
-		var node = 
-		{
-			wrap : wrap,
-			diagrams : diagrams[0],
-			text : text[0]
-		};
-		return node;
+		}
+		return new ukeGeeks.data.htmlHandles(wrap, diagrams[0], text[0]);
 	};
 
 	/**
 	 * 
-	 * @method _makeNodeById
+	 * @method _getHandlesFromId
 	 * @private
-	 * @param node {nodeobjc} 
-	 */
-	var _makeNodeById = function(){
-		var node = 
-		{
-			wrap : document.getElementById(ukeGeeks.settings.ids.container),
-			diagrams : document.getElementById(ukeGeeks.settings.ids.canvas),
-			text : document.getElementById(ukeGeeks.settings.ids.songText)
-		};
-		return node;
-		}
+	 * @retuns {ukeGeeks.data.htmlHandles} 
+	 */
+	var _getHandlesFromId = function(){
+		return new ukeGeeks.data.htmlHandles(
+			document.getElementById(ukeGeeks.settings.ids.container),
+			document.getElementById(ukeGeeks.settings.ids.canvas),
+			document.getElementById(ukeGeeks.settings.ids.songText)
+		);
+	};
+	
 }
diff --git a/js/ukeGeeks.scriptasaurus.min.js b/js/ukeGeeks.scriptasaurus.min.js
index 5fc3773..1328a29 100644
--- a/js/ukeGeeks.scriptasaurus.min.js
+++ b/js/ukeGeeks.scriptasaurus.min.js
@@ -27,8 +27,9 @@ return node;};var sizeRe=/\b(\d+)(pt|px)\b/;var _scaleFont=function(font,mulitpl
 var size=parseInt(bits[1])*mulitplier;return font.replace(sizeRe,size+bits[2]);};this.scale=function(mulitplier){if(mulitplier==1.0){return;}
 for(var i in this.fonts){this.fonts[i]=_scaleFont(this.fonts[i],mulitplier);}
 this.fretBox=_scaleNode(this.fretBox,mulitplier);};};
-;ukeGeeks.data=new function(){this.expandedChord=function(name){this.name=name;this.dots=[];this.muted=[];};this.song=function(){this.title='';this.album='';this.artist='';this.st='';this.st2='';this.body='';this.hasChords=false;this.ugsMeta=[];this.defs=[];};this.dot=function(string,fret,finger){this.string=string;this.fret=fret;this.finger=finger;};this.instrument=function(key,name,tuning,chords){this.key=key;this.name=name;this.tuning=tuning;this.chords=chords;};}
-;ukeGeeks.toolsLite=new function(){var regEx={dbleSpace:/\s{2,}/g,trim:/^\s+|\s+$/g};this.addClass=function(element,className){if(!this.hasClass(element,className)){element.className+=' '+className;}};this.hasClass=function(element,className){return element.className.match(getRegEx(className));};this.removeClass=function(element,className){if(this.hasClass(element,className)){var reg=getRegEx(className);element.className=element.className.replace(reg,' ');}};var getRegEx=function(className){return new RegExp('(\\s|^)'+className+'(\\s|$)');};this.trim=function(str){return str.replace(regEx.trim,'');};this.pack=function(value){return value.replace(regEx.dbleSpace,' ').replace(regEx.trim,'');};this.getElementsByClass=function(searchClass,node,tag){if(node==null){node=document;}
+;ukeGeeks.data=new function(){this.expandedChord=function(name){this.name=name;this.dots=[];this.muted=[];};this.song=function(){this.title='';this.album='';this.artist='';this.st='';this.st2='';this.body='';this.hasChords=false;this.ugsMeta=[];this.defs=[];};this.dot=function(string,fret,finger){this.string=string;this.fret=fret;this.finger=finger;};this.instrument=function(key,name,tuning,chords){this.key=key;this.name=name;this.tuning=tuning;this.chords=chords;};this.htmlHandles=function(wrap,diagrams,text){this.wrap=wrap;this.diagrams=diagrams;this.text=text;};}
+;ukeGeeks.toolsLite=new function(){var regEx={dbleSpace:/\s{2,}/g,trim:/^\s+|\s+$/g};this.addClass=function(element,className){if(!this.hasClass(element,className)){element.className+=' '+className;}};this.hasClass=function(element,className){return element.className.match(getRegEx(className));};this.removeClass=function(element,className){if(this.hasClass(element,className)){var reg=getRegEx(className);element.className=element.className.replace(reg,' ');}};this.setClass=function(element,className,isActive){if(isActive){this.addClass(element,className);}
+else{this.removeClass(element,className);}};var getRegEx=function(className){return new RegExp('(\\s|^)'+className+'(\\s|$)');};this.trim=function(str){return str.replace(regEx.trim,'');};this.pack=function(value){return value.replace(regEx.dbleSpace,' ').replace(regEx.trim,'');};this.getElementsByClass=function(searchClass,node,tag){if(node==null){node=document;}
 if(node.getElementsByClassName){return node.getElementsByClassName(searchClass);}
 var classElements=new Array();if(tag==null){tag='*';}
 var els=node.getElementsByTagName(tag);var elsLen=els.length;var pattern=new RegExp("(^|\\s)"+searchClass+"(\\s|$)");for(i=0,j=0;i<elsLen;i++){if(pattern.test(els[i].className)){classElements[j]=els[i];j++;}}
@@ -297,15 +298,15 @@ return html;},_echo:function(song){for(var i in song){console.log('>> '+i+'. '+s
 tmpBlk={type:this._getBlockType(lines[i]),lines:[]};if(!isMarker){tmpBlk.lines.push(lines[i]);}}
 else{var s=ukeGeeks.toolsLite.trim(lines[i]);if(s.length>0){tmpBlk.lines.push(s);}}}
 if(tmpBlk.lines.length>0){song.push(tmpBlk);}
-return song;},_parseInstr:function(song){var regEx={instr:/\{[^}]+?:.*?\}/im,cmdArgs:/\{.+?:(.*)\}/gi,cmdVerb:/\{(.+?):.*\}/gi};for(var i in song){for(var j in song[i].lines){if(regEx.instr.test(song[i].lines[j])){var args=song[i].lines[j].replace(regEx.cmdArgs,'$1');var verb=song[i].lines[j].replace(regEx.cmdVerb,'$1').toLowerCase();var tmpBlk={type:'',lines:[]};switch(verb){case'title':case't':tmpBlk.type=this.blockTypeEnum.Title;break;case'artist':tmpBlk.type=this.blockTypeEnum.Artist;break;case'subtitle':case'st':tmpBlk.type=this.blockTypeEnum.Subtitle;break;case'album':tmpBlk.type=this.blockTypeEnum.Album;break;case'comment':case'c':tmpBlk.type=this.blockTypeEnum.Comment;break;case'define':tmpBlk.type=this.blockTypeEnum.ChordDefinition;break;case'ukegeeks-meta':tmpBlk.type=this.blockTypeEnum.UkeGeeksMeta;break;default:tmpBlk.type='Undefined-'+verb;break;}
+return song;},_parseInstr:function(song){var regEx={instr:/\{[^}]+?:.*?\}/im,cmdArgs:/\{.+?:(.*)\}/gi,cmdVerb:/\{(.+?)\s*:.*\}/gi};for(var i in song){for(var j in song[i].lines){if(regEx.instr.test(song[i].lines[j])){var args=song[i].lines[j].replace(regEx.cmdArgs,'$1');var verb=song[i].lines[j].replace(regEx.cmdVerb,'$1').toLowerCase();verb=verb.replace(/\r/,'');var tmpBlk={type:'',lines:[]};switch(verb){case'title':case't':tmpBlk.type=this.blockTypeEnum.Title;break;case'artist':tmpBlk.type=this.blockTypeEnum.Artist;break;case'subtitle':case'st':tmpBlk.type=this.blockTypeEnum.Subtitle;break;case'album':tmpBlk.type=this.blockTypeEnum.Album;break;case'comment':case'c':tmpBlk.type=this.blockTypeEnum.Comment;break;case'define':tmpBlk.type=this.blockTypeEnum.ChordDefinition;break;case'ukegeeks-meta':tmpBlk.type=this.blockTypeEnum.UkeGeeksMeta;break;default:tmpBlk.type='Undefined-'+verb;break;}
 tmpBlk.lines[0]=ukeGeeks.toolsLite.trim(args);song[i].lines[j]=tmpBlk;}}}
 return song;},_parseSimpleInstr:function(song){var regEx={columnBreak:/\s*{\s*(column_break|colb)\s*}\s*/im};for(var i in song){for(var j in song[i].lines){if(regEx.columnBreak.test(song[i].lines[j])){this.columnCount++;song[i].lines[j]={type:this.blockTypeEnum.ColumnBreak,lines:[]};}}}
 return song;},_markChordLines:function(song){var regEx={chord:/\[(.+?)]/i,allChords:/\[(.+?)]/img};var hasChrd;var isChrdOnly;var line;for(var i in song){if(song[i].type==this.blockTypeEnum.TextBlock||song[i].type==this.blockTypeEnum.ChorusBlock){for(var j in song[i].lines){line=song[i].lines[j];if(typeof(line)=='string'){hasChrd=regEx.chord.test(line);this.hasChords=this.hasChords||hasChrd;isChrdOnly=hasChrd&&(ukeGeeks.toolsLite.trim(line.replace(regEx.allChords,'')).length<1);song[i].lines[j]={type:(isChrdOnly?this.blockTypeEnum.ChordOnlyText:(hasChrd?this.blockTypeEnum.ChordText:this.blockTypeEnum.PlainText)),lines:[line]};}}}}
 return song;},_getInfo:function(song,type){var rtn=[];for(var i in song){if(song[i].type==type){rtn.push(song[i].lines[0]);}
 else if(song[i].type==this.blockTypeEnum.TextBlock){for(var j in song[i].lines){if(song[i].lines[j].type==type){rtn.push(song[i].lines[j].lines[0]);}}}}
 return rtn;},_stripHtml:function(text){var regEx={pre:/<\/?pre>/img,htmlComment:/<!--(.|\n)*?-->/gm};return text.replace(regEx.pre,'').replace(regEx.htmlComment,'');}};
-;ukeGeeks.chordPainter=function(){};ukeGeeks.chordPainter.prototype={brush:null,errors:[],nodes:null,init:function(domNodes){this.brush=new ukeGeeks.chordBrush;this.brush.init();this.nodes=domNodes;},show:function(chords){this.nodes.diagrams.innerHTML='';this.errors=[];for(var i=0;i<chords.length;i++){var c=ukeGeeks.definitions.get(chords[i]);if(!c){this.errors.push(chords[i]);continue;}
-this.brush.plot(this.nodes.diagrams,c,ukeGeeks.settings.fretBox);}},showInline:function(chords){var e=this.nodes.text.getElementsByTagName('code');if(e.length<1)return;for(var i=0;i<chords.length;i++){var c=ukeGeeks.definitions.get(chords[i]);if(!c){continue;}
+;ukeGeeks.chordPainter=function(){};ukeGeeks.chordPainter.prototype={brush:null,errors:[],handles:null,init:function(handles){this.brush=new ukeGeeks.chordBrush;this.brush.init();this.handles=handles;},show:function(chords){this.handles.diagrams.innerHTML='';this.errors=[];for(var i=0;i<chords.length;i++){var c=ukeGeeks.definitions.get(chords[i]);if(!c){this.errors.push(chords[i]);continue;}
+this.brush.plot(this.handles.diagrams,c,ukeGeeks.settings.fretBox);}},showInline:function(chords){var e=this.handles.text.getElementsByTagName('code');if(e.length<1)return;for(var i=0;i<chords.length;i++){var c=ukeGeeks.definitions.get(chords[i]);if(!c){continue;}
 for(var j=0;j<e.length;j++){if(e[j].getAttribute('data-chordName')==c.name){this.brush.plot(e[j],c,ukeGeeks.settings.inlineFretBox);}}}},getErrors:function(){return this.errors;}}
 ;ukeGeeks.tabs=function(){};ukeGeeks.tabs.prototype={init:function(){},replace:function(h){var tabBlocks=h.getElementsByTagName('pre');for(var i in tabBlocks){if(tabBlocks[i].className=='ugsTabs'){var s=tabBlocks[i].innerHTML;tabBlocks[i].innerHTML="";this.loadBlocks(s,tabBlocks[i]);}}},loadBlocks:function(text,outElement){var lns=text.split('\n');var tab=[];for(var i in lns){var s=ukeGeeks.toolsLite.trim(lns[i]);if(s.length>0){tab.push(s);}
 if(tab.length==4){this.redraw(tab,outElement);tab=[];}}},redraw:function(inTabs,outElement){inTabs=(typeof(inTabs)=='string')?(inTabs.split('\n')):inTabs;if(inTabs.length<4){return;}
@@ -327,11 +328,13 @@ ctx.strokeStyle=settings.lineColor;ctx.lineWidth=settings.lineWidth;ctx.stroke()
 else if(!isNaN(c)){ukeGeeks.canvasTools.drawDot(ctx,center,settings.dotRadius,settings.dotColor);ukeGeeks.canvasTools.drawText(ctx,{x:center.x,y:(center.y+0.5*settings.dotRadius)},c,settings.textFont,settings.textColor);}
 center.x+=settings.noteSpacing;}
 center.y+=settings.lineSpacing;}},_drawMeasure:function(ctx,pos,settings,heavy){var offset=settings.lineWidth/2;ctx.beginPath();ctx.moveTo(pos.x+offset,pos.y);ctx.lineTo(pos.x+offset,pos.y+3*settings.lineSpacing);ctx.strokeStyle=settings.lineColor;ctx.lineWidth=(heavy?4.5:1)*settings.lineWidth;ctx.stroke();ctx.closePath();},_drawLabels:function(ctx,pos,settings){var labels=ukeGeeks.settings.tuning.slice(0).reverse();for(var i=0;i<4;i++){ukeGeeks.canvasTools.drawText(ctx,{x:1,y:(pos.y+(i+0.3)*settings.lineSpacing)},labels[i],settings.labelFont,settings.lineColor,'left');}}}
-;ukeGeeks.scriptasaurus=new function(){this.init=function(isIeFamily){ukeGeeks.settings.environment.isIe=isIeFamily;ukeGeeks.definitions.useInstrument(ukeGeeks.definitions.instrument.sopranoUke);};this.run=function(){var node=_makeNodeById();if(!node.diagrams||!node.text||!node.wrap){return null;}
-return _runSong(node);};this.runByClasses=function(){var songs=[];var songWraps=ukeGeeks.toolsLite.getElementsByClass(ukeGeeks.settings.wrapClasses.wrap);for(var i=0;i<songWraps.length;i++){var node=_makeNodeByClass(songWraps[i]);if(node==null){continue;}
-songs.push(_runSong(node));}
-return songs;};this.setTuningOffset=function(offset){ukeGeeks.definitions.useInstrument(offset);};var _runSong=function(nodes){var cpm=new ukeGeeks.cpmParser;cpm.init();var song=cpm.parse(nodes.text.innerHTML);ukeGeeks.definitions.replace(song.defs);var chrdPrsr=new ukeGeeks.chordParser;chrdPrsr.init();nodes.text.innerHTML=chrdPrsr.parse(song.body);var chordsInUse=chrdPrsr.getChords();var painter=new ukeGeeks.chordPainter;painter.init(nodes);painter.show(chordsInUse);if(ukeGeeks.settings.inlineDiagrams){ukeGeeks.toolsLite.addClass(nodes.wrap,'ugsInlineDiagrams');painter.showInline(chordsInUse);}
-var tabs=new ukeGeeks.tabs;tabs.init();tabs.replace(nodes.text);var container=nodes.wrap;if(container){if(!song.hasChords){ukeGeeks.toolsLite.addClass(container,'ugsNoChords');}
+;ukeGeeks.scriptasaurus=new function(){this.init=function(isIeFamily){ukeGeeks.settings.environment.isIe=isIeFamily;ukeGeeks.definitions.useInstrument(ukeGeeks.definitions.instrument.sopranoUke);};this.run=function(){var handles=_getHandlesFromId();if(!handles||!handles.diagrams||!handles.text||!handles.wrap){return null;}
+_errList=[];var song=_runSong(handles);showErrors(_errList[0]);return song;};this.runByClasses=function(){var songs=[];var songWraps=ukeGeeks.toolsLite.getElementsByClass(ukeGeeks.settings.wrapClasses.wrap);for(var i=0;i<songWraps.length;i++){var handles=_getHandlesFromClass(songWraps[i]);if(handles==null){continue;}
+songs.push(_runSong(handles));}
+return songs;};this.setTuningOffset=function(offset){ukeGeeks.definitions.useInstrument(offset);};var _errList=[];var _runSong=function(handles){var cpm=new ukeGeeks.cpmParser;cpm.init();var song=cpm.parse(handles.text.innerHTML);ukeGeeks.definitions.replace(song.defs);var chrdPrsr=new ukeGeeks.chordParser;chrdPrsr.init();handles.text.innerHTML=chrdPrsr.parse(song.body);var chordsInUse=chrdPrsr.getChords();var painter=new ukeGeeks.chordPainter;painter.init(handles);painter.show(chordsInUse);if(ukeGeeks.settings.inlineDiagrams){ukeGeeks.toolsLite.addClass(handles.wrap,'ugsInlineDiagrams');painter.showInline(chordsInUse);}
+var tabs=new ukeGeeks.tabs;tabs.init();tabs.replace(handles.text);_errList.push(painter.getErrors());var container=handles.wrap;if(container){if(!song.hasChords){ukeGeeks.toolsLite.addClass(container,'ugsNoChords');}
 else{ukeGeeks.toolsLite.removeClass(container,'ugsNoChords');}}
-return song;};var _makeNodeByClass=function(wrap){var diagrams=ukeGeeks.toolsLite.getElementsByClass(ukeGeeks.settings.wrapClasses.diagrams,wrap);var text=ukeGeeks.toolsLite.getElementsByClass(ukeGeeks.settings.wrapClasses.text,wrap);if((diagrams==undefined)||(diagrams.length<1)||(text==undefined)||(text.length<1)){return null;}
-var node={wrap:wrap,diagrams:diagrams[0],text:text[0]};return node;};var _makeNodeById=function(){var node={wrap:document.getElementById(ukeGeeks.settings.ids.container),diagrams:document.getElementById(ukeGeeks.settings.ids.canvas),text:document.getElementById(ukeGeeks.settings.ids.songText)};return node;}}
\ No newline at end of file
+return song;};var showErrors=function(errs){if(errs.length<1){return;}
+console.log(typeof(errs[0]));var s='';for(var i=0;i<errs.length;i++){s+=(s.length>0)?', ':'';s+=errs[i];}
+alert('Forgive me, but I don\'t know the following chords: '+s);};var _getHandlesFromClass=function(wrap){var diagrams=ukeGeeks.toolsLite.getElementsByClass(ukeGeeks.settings.wrapClasses.diagrams,wrap);var text=ukeGeeks.toolsLite.getElementsByClass(ukeGeeks.settings.wrapClasses.text,wrap);if((diagrams==undefined)||(diagrams.length<1)||(text==undefined)||(text.length<1)){return null;}
+return new ukeGeeks.data.htmlHandles(wrap,diagrams[0],text[0]);};var _getHandlesFromId=function(){return new ukeGeeks.data.htmlHandles(document.getElementById(ukeGeeks.settings.ids.container),document.getElementById(ukeGeeks.settings.ids.canvas),document.getElementById(ukeGeeks.settings.ids.songText));};}
\ No newline at end of file
diff --git a/js/ukeGeeks.toolsLite.js b/js/ukeGeeks.toolsLite.js
index 86c76ef..17efaf3 100644
--- a/js/ukeGeeks.toolsLite.js
+++ b/js/ukeGeeks.toolsLite.js
@@ -35,6 +35,15 @@ ukeGeeks.toolsLite = new function(){
 		}
 	};
 	
+	this.setClass = function(element, className, isActive) {
+		if (isActive){
+			this.addClass(element, className);
+		}
+		else{
+			this.removeClass(element, className);
+		}
+	};
+
 	var getRegEx = function(className){
 		return new RegExp('(\\s|^)'+className+'(\\s|$)');
 	};
diff --git a/readme.htm b/readme.htm
index a64fb48..fa7809a 100644
--- a/readme.htm
+++ b/readme.htm
@@ -13,7 +13,7 @@
 	margin-bottom:1.5em;
 	padding-bottom:1.5em;
 }
-.topOfPage {
+.topOfPage{
 	font-size:.85em;
 	text-align:right;
 }
@@ -36,8 +36,8 @@ <h3>Contents of this file</h3>
 				<li><a href="#static">Static Site Info</a></li>
 				<li><a href="#mvc">PHP Pages</a>
 					<ol>
-						<li><a href="#mvc">Using the PHP &quot;Lite&quot; MVC Pages</a></li>
-						<li><a href="#mod_rewrite">Using mod_rewrite For Pretty URL's</a></li>
+				<li><a href="#mvc">Using the PHP &quot;Lite&quot; MVC Pages</a></li>
+				<li><a href="#mod_rewrite">Using mod_rewrite For Pretty URL's</a></li>
 					</ol>
 				</li>
 				<li><a href="#trouble">Trouble Shooting</a></li>
@@ -170,7 +170,7 @@ <h4>The Views</h4>
 			</li>
 			<li>
 				<h4>The View Models</h4>
-				<p>The fully populated objects passed to the view. All View Model classes inherit from <code> _base_Vm.php</code>.</p>
+				<p>The fully populated objects passed to the view. All View Model classes inherit from <code>	_base_Vm.php</code>.</p>
 				<dl>
 					<dt><code>SongList_Vm.php</code></dt>
 					<dd>&hellip;data entity passed to <code>song-list.php</code>.</dd>
diff --git a/song.php b/song.php
index f3709dd..86d9baa 100644
--- a/song.php
+++ b/song.php
@@ -50,7 +50,7 @@
 			echo('</div><!-- /.metaInfo -->');
 		}
 		?>
-	<div id="ukeSongContainer" class="ugsLayoutTwoColumn">
+	<div id="ukeSongContainer" class="ugsLayoutTwoColumn ugs-song-wrap">
 		<aside id="ukeChordsCanvas" class="ugs-diagrams-wrap ugs-grouped"></aside>
 		<article id="ukeSongText" class="ugs-source-wrap"><pre><?php echo($model->Body); ?></pre></article>
 	</div>
diff --git a/songs/my-little-grass-shack-in-kealakekua.htm b/songs/my-little-grass-shack-in-kealakekua.htm
index ec21884..7695a9f 100644
--- a/songs/my-little-grass-shack-in-kealakekua.htm
+++ b/songs/my-little-grass-shack-in-kealakekua.htm
@@ -1,49 +1,48 @@
 <!DOCTYPE HTML>
 <html lang="en"><!-- InstanceBegin template="/Templates/ugs-song.dwt" codeOutsideHTMLIsLocked="false" -->
 <head>
-	<meta charset="utf-8" />
-	<!-- InstanceBeginEditable name="doctitle" -->
-	<title>My Little Grass Shack in Kealakekua - Cogswell, Harrison, &amp; Noble</title>
-	<!-- InstanceEndEditable -->
-	<script type="text/javascript">var isLegacyIe = false;</script>
-	<!--[if lt IE 9]>
-	<script type="text/javascript">
-	isLegacyIe = true;
-	document.getElementsByTagName('html')[0].className = 'ie';
-	</script>
-	<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-	<script type="text/javascript" src="../js/excanvas.js"></script>
-	<![endif]-->
-	<link rel="stylesheet" type="text/css" href="../css/yuiReset.css" />
-	<link rel="stylesheet" type="text/css" href="../css/basic-page-layout.css" media="all" />
-	<link rel="stylesheet" type="text/css" href="../css/ukeGeeks.music.css" media="all" />
-	<link rel="stylesheet" type="text/css" href="../css/ukeGeeks.musicPrint.css" media="print" />
-	<!-- meta UkeGeek beta .5 -->
-	<!-- InstanceBeginEditable name="head" --><!-- InstanceEndEditable -->
+<meta charset="utf-8" />
+<!-- InstanceBeginEditable name="doctitle" -->
+<title>My Little Grass Shack in Kealakekua - Cogswell, Harrison, &amp; Noble</title>
+<!-- InstanceEndEditable -->
+<script type="text/javascript">var isLegacyIe = false;</script>
+<!--[if lt IE 9]>
+<script type="text/javascript">
+isLegacyIe = true;
+document.getElementsByTagName('html')[0].className = 'ie';
+</script>
+<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<script type="text/javascript" src="../js/excanvas.js"></script>
+<![endif]-->
+<link rel="stylesheet" type="text/css" href="../css/yuiReset.css" />
+<link rel="stylesheet" type="text/css" href="../css/basic-page-layout.css" media="all" />
+<link rel="stylesheet" type="text/css" href="../css/ukeGeeks.music.css" media="all" />
+<link rel="stylesheet" type="text/css" href="../css/ukeGeeks.musicPrint.css" media="print" />
+<!-- meta UkeGeek beta .5 -->
+<!-- InstanceBeginEditable name="head" --><!-- InstanceEndEditable -->
 </head>
 <body>
-	<section>
-		<header>
-			<hgroup>
-				<!-- InstanceBeginEditable name="header" -->
-				<h1>My Little Grass Shack in Kealakekua</h1>
-				<h2>Lyrics &amp; Music: Bill Cogswell, Tommy Harrison and Johnny Noble &copy; 1933</h2>
-				<!-- InstanceEndEditable -->
-			</hgroup>
-		</header>
-		<div class="metaInfo">
-			<!-- InstanceBeginEditable name="metaInfo" -->
-			<!-- InstanceEndEditable -->
-		</div><!--/.metaInfo-->
-		<div id="ukeSongContainer" class="ugsLayoutTwoColumn ">
-			<aside id="ukeChordsCanvas" class="ugs-diagrams-wrap ugs-grouped">
-				<canvas>
-					<p>Your browser doesn't support canvas please upgrade (FREE) to <a href="http://www.google.com/chrome">Google Chrome</a>, <a href="http://www.mozilla.com/en-US/firefox/">Firefox</a>, or <a href="http://www.apple.com/safari/">Apple Safari</a>.</p>
-				</canvas>
-			</aside>
-			<article id="ukeSongText" class="ugs-source-wrap">
+<section>
+	<header>
+		<hgroup> <!-- InstanceBeginEditable name="header" -->
+	<h1>My Little Grass Shack in Kealakekua</h1>
+	<h2>Lyrics &amp; Music: Bill Cogswell, Tommy Harrison and Johnny Noble &copy; 1933</h2>
+	<!-- InstanceEndEditable -->
+	</hgroup>
+	</header>
+	<div class="metaInfo"> <!-- InstanceBeginEditable name="metaInfo" -->
+		<!-- InstanceEndEditable -->
+	</div>
+	<!--/.metaInfo-->
+	<div id="ukeSongContainer" class="ugsLayoutTwoColumn ugs-song-wrap">
+		<aside id="ukeChordsCanvas" class="ugs-diagrams-wrap ugs-grouped">
+			<canvas>
+				<p>Your browser doesn't support canvas please upgrade (FREE) to <a href="http://www.google.com/chrome">Google Chrome</a>, <a href="http://www.mozilla.com/en-US/firefox/">Firefox</a>, or <a href="http://www.apple.com/safari/">Apple Safari</a>.</p>
+			</canvas>
+		</aside>
+		<article id="ukeSongText" class="ugs-source-wrap">
 			<pre>
-	<!-- InstanceBeginEditable name="ezChords" -->
+<!-- InstanceBeginEditable name="ezChords" -->
 I want to go [G]back to my little grass shack
 In Kealakekua, [A7]Hawaii
 I want to [D7]be with all the kanes and wahines
@@ -69,25 +68,24 @@ <h2>Lyrics &amp; Music: Bill Cogswell, Tommy Harrison and Johnny Noble &copy; 19
 
 Where the [D7]humu-humu nuku-nuku a pua'a
 Go swimming [G]by
-	<!-- InstanceEndEditable --> 
-			</pre>
-			</article>
-		</div>
-		<!-- /#ukeSongContainer -->
-	</section>
-	<footer>
-		<p>Note: Standard <strong>GCEA</strong> Soprano Ukulele Tuning. <small>Powered by <a href="http://ukegeeks.com/" title="Uke Geeks for free ukulele JavaScript tools">UkeGeeks' Scriptasaurus</a> &bull; ukegeeks.com</small></p>
-	</footer>
+		<!-- InstanceEndEditable --> 
+		</pre>
+		</article>
+	</div>
+	<!-- /#ukeSongContainer -->
+</section>
+<footer>
+	<p>Note: Standard <strong>GCEA</strong> Soprano Ukulele Tuning. <small>Powered by <a href="http://ukegeeks.com/" title="Uke Geeks for free ukulele JavaScript tools">UkeGeeks' Scriptasaurus</a> &bull; ukegeeks.com</small></p>
+</footer>
 <!-- InstanceBeginEditable name="postBody" --><!-- InstanceEndEditable -->
 <script type="text/javascript" src="../js/ukeGeeks.scriptasaurus.min.js"></script>
 <!-- InstanceBeginEditable name="ukeGeeksReady" -->
 <script type="text/javascript">
-	/**
-	 *	Put your code here to change any of UkeGeek's default settings.
-	 */
+/**
+ *	Put your code here to change any of UkeGeek's default settings.
+ */
 </script>
 <!-- InstanceEndEditable -->
 <script type="text/javascript" src="../js/startup.js"></script>
 </body>
-<!-- InstanceEnd -->
-</html>
\ No newline at end of file
+<!-- InstanceEnd --></html>
diff --git a/ugsphp/Ugs.php b/ugsphp/Ugs.php
index de2c9ab..b2ac193 100644
--- a/ugsphp/Ugs.php
+++ b/ugsphp/Ugs.php
@@ -40,6 +40,7 @@ public static function GetBuilder($controller) {
 	private static function _Init(){
 		$appRoot = dirname(__FILE__);
 		include_once($appRoot . '/Config.php');
+		include_once($appRoot . '/classes/FileHelper.php');
 		include_once($appRoot . '/viewmodels/_base_Vm.php');
 		Ugs::$config = new Config($appRoot);
 	}
diff --git a/ugsphp/builders/SongList_Vmb.php b/ugsphp/builders/SongList_Vmb.php
index 4973083..e7eb0dd 100644
--- a/ugsphp/builders/SongList_Vmb.php
+++ b/ugsphp/builders/SongList_Vmb.php
@@ -16,7 +16,7 @@ class SongList_Vmb {
 	// PUBLIC METHODS
 	// -----------------------------------------
 	public function Build() {
-		$this->_files = $this->getFiles(Config::SongDirectory);
+		$this->_files = $this->getFilenames(Config::SongDirectory);
 		$view = new SongList_Vm();
 		$view->SongList = $this->listFiles();
 		header('X-Powered-By: ' . Config::PoweredBy);
@@ -48,7 +48,6 @@ private function listFiles() {
 
 	/**
 	 * Handles titles beginning with "The"
-	 * @private 
 	 * @method getTitle 
 	 * @param string $filename 
 	 * @return string
@@ -92,19 +91,24 @@ private function sortSongs($list) {
 	 * @param string $dir 
 	 * @return array
 	 */
-	private function getFiles($dir) {
-		$f = array();
+	private function getFilenames($dir) {
+		if (!is_dir($dir)) {
+			return array();
+		}
+		
 		// Open a known directory, and proceed to read its contents
-		if (is_dir($dir)) {
-			if ($dh = opendir($dir)) {
-				while (($file = readdir($dh)) !== false) {
-					if ((filetype($dir . $file) == 'file') && (preg_match($this->pattern, $file) === 1)){
-						$f[] = $file;
-					}
-				}
-				closedir($dh);
+		// yes, the assignment below is deliberate.
+		if (!($dh = opendir($dir))) {
+			return array();
+		}
+		
+		$f = array();
+		while (($file = readdir($dh)) !== false) {
+			if ((filetype($dir . $file) == 'file') && (preg_match($this->pattern, $file) === 1)){
+				$f[] = $file;
 			}
 		}
+		closedir($dh);
 		sort($f, SORT_STRING);
 		return $f;
 	}
diff --git a/ugsphp/builders/Song_Vmb.php b/ugsphp/builders/Song_Vmb.php
index 9007103..7073746 100644
--- a/ugsphp/builders/Song_Vmb.php
+++ b/ugsphp/builders/Song_Vmb.php
@@ -15,9 +15,14 @@ class Song_Vmb {
 	// -----------------------------------------
 	// PUBLIC METHODS
 	// -----------------------------------------
+	
+	/**
+	 * Parses file (using URL query param) and attempts to load View Model
+	 * @return Song_Vm 
+	 */
 	public function Build() {
-		$this->fname = $this->getFilename();
-		$data = $this->getFile(Config::SongDirectory . $this->fname);
+		$this->fname = FileHelper::getFilename();
+		$data = FileHelper::getFile(Config::SongDirectory . $this->fname);
 		$this->song = $this->parseSong($data);
 
 		$title = htmlspecialchars((($this->song->isOK) ? ($this->song->title . ((strlen($this->song->subtitle) > 0) ? (' | ' . $this->song->subtitle) : '')) : 'Not Found'));
@@ -39,34 +44,13 @@ public function Build() {
 	// -----------------------------------------
 	// PRIVATE METHODS
 	// -----------------------------------------
-	private function getFilename() {
-		$s = (isset($_GET['song'])) ? $_GET['song'] : '';
-		if (strlen($s) < 1){
-			return Config::NotFound_404File;
-		}
-		if (strpos($s, '.txt') || strpos($s, '.cpm')){
-			return $s;
-		}
-		$pattern = '/(.*[\/])?(.*?)(\.html?)?$/';
-		$s = preg_replace($pattern, '$2', $s) . Config::FileExtension;
-		return $s;
-	}
-
-	//****
-	private function getFile(/* string */ $fname) {
-		$data = '';
-		if (!file_exists($fname)) {
-			return null;
-			// die($errPrefix." &quot;".$fname."&quot; not found.");
-		}
-		$fh = fopen($fname, 'r');
-		$data = fread($fh, Config::MaxFileSize);
-		fclose($fh);
-		return $data;
-	}
-
-	//****
-	private function parseSong(/* string */ $text) {
+	
+	/**
+	 *
+	 * @param string $text input text file block
+	 * @return Song(object)
+	 */
+	private function parseSong($text) {
 		$song = (object) array(
 			 'isOK' => false,
 			 'title' => 'Sorry... Song Not Found',
@@ -89,27 +73,47 @@ private function parseSong(/* string */ $text) {
 		return $song;
 	}
 
-	//****
+	/**
+	 * parses Title tag: {Title: Blah Blah}
+	 * @param string $text input string to be parses
+	 * @return string 
+	 */
 	private function getTitle($text) {
 		return $this->_matchRegEx($text, 2, "/{(t|title)\s*:\s*(.+?)}/i");
 	}
 
-	//****
+	/**
+	 * parses Subtitle tag: {Subtitle: Blah Blah}
+	 * @param string $text input string to be parses
+	 * @return string 
+	 */
 	private function getSubtitle($text) {
 		return $this->_matchRegEx($text, 2, "/{(st|subtitle)\s*:\s*(.+?)}/i");
 	}
 
-	//****
+	/**
+	 * parses Artist tag: {Artist: Blah Blah}
+	 * @param string $text input string to be parses
+	 * @return string 
+	 */
 	private function getArtist($text) {
 		return $this->_matchRegEx($text, 1, "/{artist\s*:\s*(.+?)}/i");
 	}
 
-	//****
+	/**
+	 * parses Album tag: {Album: Blah Blah}
+	 * @param string $text input string to be parses
+	 * @return string 
+	 */
 	private function getAlbum($text) {
 		return $this->_matchRegEx($text, 1, "/{album\s*:\s*(.+?)}/i");
 	}
 
-	//****
+	/**
+	 * parses Uke Geeks Meta tag: {ukegeeks-meta: Blah Blah}
+	 * @param string $text input string to be parses
+	 * @return string 
+	 */
 	private function getMeta($text) {
 		$rtn = array();
 		$regEx = "/{(ukegeeks-meta|meta)\s*:\s*(.+?)}/i";
@@ -123,6 +127,14 @@ private function getMeta($text) {
 	}
 
 	// Helpers
+	
+	/**
+	 *
+	 * @param string $text input string to be parses
+	 * @param int $patternIndex 
+	 * @param string $regEx regular expression string
+	 * @return string
+	 */
 	private function _matchRegEx($text, $patternIndex, $regEx){
 		preg_match_all($regEx, $text, $matches);
 		return (count($matches[$patternIndex]) < 1) ? '' : $matches[$patternIndex][0];
diff --git a/ugsphp/builders/Source_Vmb.php b/ugsphp/builders/Source_Vmb.php
index 04e7236..de51f09 100644
--- a/ugsphp/builders/Source_Vmb.php
+++ b/ugsphp/builders/Source_Vmb.php
@@ -12,8 +12,8 @@ class Source_Vmb {
 	// PUBLIC METHODS
 	// -----------------------------------------
 	public function Build() {
-		$fname = $this->getFilename();
-		$data = $this->getFile(Config::SongDirectory . $fname);
+		$fname = FileHelper::getFilename();
+		$data = FileHelper::getFile(Config::SongDirectory . $fname);
 
 		$modelView = new Source_Vm();
 		$modelView->PageTitle = 'Song Source for &quot;' . $fname . '&quot; ChordPro (CPM)/UkeGeeks File Format';
@@ -23,33 +23,5 @@ public function Build() {
 		return $modelView;
 	}
 
-	// -----------------------------------------
-	// PRIVATE METHODS
-	// -----------------------------------------
-	private function getFilename() {
-		$s = (isset($_GET['song'])) ? $_GET['song'] : '';
-		if (strlen($s) < 1){
-			return Config::NotFound_404File;
-		}
-		if (strpos($s, '.txt') || strpos($s, '.cpm')){
-			return $s;
-		}
-		$pattern = '/(.*[\/])?(.*?)(\.html?)?$/';
-		$s = preg_replace($pattern, '$2', $s) . Config::FileExtension;
-		return $s;
-	}
-
-	//****
-	private function getFile(/* string */ $fname) {
-		$data = '';
-		if (!file_exists($fname)) {
-			return null;
-			// die($errPrefix." &quot;".$fname."&quot; not found.");
-		}
-		$fh = fopen($fname, 'r');
-		$data = fread($fh, Config::MaxFileSize);
-		fclose($fh);
-		return $data;
-	}
 }
 
diff --git a/ugsphp/classes/FileHelper.php b/ugsphp/classes/FileHelper.php
new file mode 100644
index 0000000..7779ef0
--- /dev/null
+++ b/ugsphp/classes/FileHelper.php
@@ -0,0 +1,41 @@
+<?php 
+
+/**
+ * Shared file access methods
+ */
+class FileHelper {
+	/**
+	 * Parses URL looks for song query string param value
+	 * @return string 
+	 */
+	public static function getFilename() {
+		$s = (isset($_GET['song'])) ? $_GET['song'] : '';
+		if (strlen($s) < 1){
+			return Config::NotFound_404File;
+		}
+		if (strpos($s, '.txt') || strpos($s, '.cpm')){
+			return $s;
+		}
+		$pattern = '/(.*[\/])?(.*?)(\.html?)?$/';
+		$s = preg_replace($pattern, '$2', $s) . Config::FileExtension;
+		return $s;
+	}
+
+	/**
+	 * tries to open and read the requested file
+	 * @param string $fname
+	 * @return string 
+	 */
+	public static function getFile($fname) {
+		$data = '';
+		if (!file_exists($fname)) {
+			return null;
+			// die($errPrefix." &quot;".$fname."&quot; not found.");
+		}
+		$fh = fopen($fname, 'r');
+		$data = fread($fh, Config::MaxFileSize);
+		fclose($fh);
+		return $data;
+	}
+
+}
\ No newline at end of file