diff --git a/.gitignore b/.gitignore
index 8b29193..842398a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-coldbox
\ No newline at end of file
+/coldbox
+/modules
+
diff --git a/README.md b/README.md
index 3b36519..f10ee32 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,136 @@
-CodeChecker
-============
+```
+   ______          __     ________              __                ___              
+  / ____/___  ____/ /__  / ____/ /_  ___  _____/ /_____  _____   /   |  ____  ____ 
+ / /   / __ \/ __  / _ \/ /   / __ \/ _ \/ ___/ //_/ _ \/ ___/  / /| | / __ \/ __ \
+/ /___/ /_/ / /_/ /  __/ /___/ / / /  __/ /__/ ,< /  __/ /     / ___ |/ /_/ / /_/ /
+\____/\____/\__,_/\___/\____/_/ /_/\___/\___/_/|_|\___/_/     /_/  |_/ .___/ .___/ 
+                                                                    /_/   /_/     
+```
 
-See the [Wiki](https://github.com/wellercs/CodeChecker/wiki)
-for instructions, documentation, credits, and release notes.
+# CodeChecker App
+
+Welcome to the CodeChecker.  A code quality tool.  This repo contains a standalone app you can run against your code.
+This app bundles the [CodeChecker core libraries](https://github.com/coldbox-modules/codechecker-core) for use in a web server.
+
+## INSTRUCTIONS
+
+Deploy this application to any web-accessible directory and start up a server.
+
+```bash
+git clone git@github.com:Ortus-Solutions/CodeChecker.git
+box install
+box server start
+```
+
+Rules may be added or modified in the app/services/Rules.cfc file.
+
+Third party plugins are packaged in app/services/.
+
+Visit <your-web-root>/CodeChecker/app/index.cfm to begin via the UI.
+
+To specify directories and/or files to review/check, use the check files form (frm_codechecker.cfm) and separate entries by a carriage return.
+
+Alternatively, only the services directory is required for running the application outside of the browser.
+
+To run CodeChecker outside of the browser, call the following:
+* Component: /services/CodeChecker
+* Function: startCodeReview
+* Parameters:
+- filepath (required string): the directory or file path for which to review
+- recurse (optional boolean): flag for whether or not to review recursively
+
+Call getResults() to return an array of structs of the code check results.
+
+## DOCUMENTATION
+
+- APPLICATION STRUCTURE
+
+This application uses a basic MVC structure.
+
+The heart of the application resides in the "services" directory. This is where the code checker and rules engines can be found. Third party plugins also reside in services.
+
+Resources such as css, javascript, images, etc. reside in the "assets" directory.
+
+The "model" directory contains files "action" files for the view layer.
+
+The "view" directory contains the UI for the results table and check files form (frm_codechecker.cfm).
+
+If you only want to run CodeChecker without a web UI, you only need the services directory.
+
+- SERVICES LAYER
+
+CodeChecker.cfc is the object that checks and enforces the defined rules. The default check function uses REFindNoCase().
+
+Rules.cfc is the object defining the code check rules.
+
+Initial categories of rules are:
+* Security
+* Performance
+* Standards
+* Maintenance
+
+Initial metadata for rules include:
+* bulkcheck - boolean value of whether to check the entire file in one pass (true) or line-by-line (false)
+* category - string value corresponding to one of the categories listed above or your own custom category
+* componentname - string value of the check component name to call in the dynamic cfinvoke
+* customcode - currently does not do anything but considering using this as an option to run custom code instead of always using the regular expression pattern
+* extensions - comma-delimited list of file extensions of files to check
+* functionname - string value of the check function name to call in the dynamic cfinvoke
+* message - string value of the explanation of the rule
+* name - string value of the title of the rule
+* passonmatch - boolean value of whether to pass or fail if a match is found
+* pattern - string value of the regular expression of the rule
+* severity - value of the severity level of the broken rule (default values are 1-5). 5 is most severe.
+* tagname - pipe delimited list of ColdFusion tags that directs the checker to run the rule only if the line contains one of the specified tags
+
+Third party plugins are supported for additional rules.
+
+Currently integrated third party plugins include:
+
+* QueryParamScanner by Peter Boughton
+* VarScoper by Mike Schierberl
+
+These plugins are automatically ran by CodeChecker.
+
+- VIEW LAYER
+
+To specify directories and/or files to review/check, use the check files form (frm_codechecker.cfm) and separate entries by a carriage return.
+
+The results of the code check are returned as an array of structs and will be displayed in a table (dsp_codechecker.cfm). The results page will show exceptions to the defined rules as well as display any failed files/directories that were not checked (i.e., missing files).
+
+Results display the following exception data:
+* Directory
+* File
+* Rule
+* Message
+* Line Number
+* Category
+* Severity
+
+- TESTS
+
+The "tests" directory contains test files containing intentionally broken rules.
+
+MXUnit tests will be written in the future.
+
+- CUSTOMIZATION
+
+Any of the default rules can be modified or deleted.
+
+To add a new rule, simply copy one of the "temprulestruct" blocks of code and paste it below another block.
+Be sure to set temprulestruct to an empty structure to clear out the data for any previously defined rules.
+Also ensure that the bottom of your block appends temprulestruct to the "rules" array.
+
+## CREDITS
+
+Steve Bryant for inspiring this project with his CodeCop application.
+http://codecop.riaforge.org/
+
+Peter Boughton for the QueryParamScanner cfc.
+http://qpscanner.riaforge.org/
+
+Mike Schierberl for the VarScoper cfc.
+http://varscoper.riaforge.org/
+
+Chris Wellers for creating the first version of the CodeChecker
+https://github.com/wellercs/CodeChecker
diff --git a/box.json b/box.json
index 46436f6..9c43417 100644
--- a/box.json
+++ b/box.json
@@ -1,105 +1,57 @@
-{
-    "name":"CodeChecker",
-    "version":"2.0.0",
-    "author":"Chris Weller <wellercs@gmail.com>",
-    "location":"USA",
-    "directory":"CodeChecker",
-    "createPackageDirectory":true,
-    "packageDirectory":"CodeChecker",
-    "homepage":"https://github.com/wellercs/CodeChecker",
-    "documentation":"https://github.com/wellercs/CodeChecker/wiki",
-    "repository":{
-        "type":"git",
-        "url":"https://github.com/wellercs/CodeChecker"
-    },
-    "bugs":"https://github.com/wellercs/CodeChecker/issues",
-    "slug":"CodeChecker",
-    "shortDescription":"A package for checking code quality.",
-    "description":"This package uses rules to evaluate code on the local system and report back possible issues based on maintenance, performance, security, and standards.",
-    "instructions":"https://github.com/wellercs/CodeChecker/wiki",
-    "changelog":"https://github.com/wellercs/CodeChecker/releases",
-    "type":"projects",
-    "keywords":[
-        "code",
-        "check",
-        "checker",
-        "review",
-        "reviewer",
-        "quality",
-        "qa",
-        "test",
-        "maintenance",
-        "performance",
-        "security",
-        "standards"
-    ],
-    "private":false,
-    "engines":[
-        {
-            "type":"railo",
-            "version":">=4.1.x"
-        },
-        {
-            "type":"adobe",
-            "version":">=9.0.0"
-        },
-        {
-            "type":"lucee",
-            "version":">4.5"
-        }
-    ],
-    "projectURL":"https://github.com/wellercs/CodeChecker",
-    "license":[
-        {
-            "type":"Apache2",
-            "url":"http://www.apache.org/licenses/LICENSE-2.0.html"
-        }
-    ],
-    "contributors":[
-        "Chris Weller <wellercs@gmail.com>",
-        "Gavin Pickin <gpickin@gmail.com>",
-        "Luis Majano <lmajano@ortussolutions.com"
-    ],
-    "dependencies":{
-        "coldbox":"4.1.0"
-    },
-    "devDependencies":{
-        
-    },
-    "installPaths":{
-        "coldbox":"coldbox"
-    },
-    "ignore":[
-        "**/.*",
-        "tests/**"
-    ],
-    "testbox":{
-        "runner":[
-            {
-                "default":""
-            }
-        ],
-        "labels":[
-            
-        ],
-        "reporter":"",
-        "reporterResults":"",
-        "bundles":[
-            ""
-        ],
-        "directory":{
-            "mapping":"",
-            "recurse":true
-        },
-        "watchers":[
-            
-        ],
-        "notify":{
-            "emails":[
-                
-            ],
-            "growl":"",
-            "url":""
-        }
-    }
+{
+    "name":"CodeChecker App",
+    "version":"2.0.2",
+    "author":"Chris Weller <wellercs@gmail.com>",
+    "homepage":"https://github.com/Ortus-Solutions/CodeChecker",
+    "documentation":"https://github.com/Ortus-Solutions/CodeChecker/wiki",
+    "createPackageDirectory":false,
+    "repository":{
+        "type":"git",
+        "url":"https://github.com/Ortus-Solutions/CodeChecker"
+    },
+    "slug":"CodeChecker",
+    "shortDescription":"A package for checking code quality.",
+    "description":"This package uses rules to evaluate code on the local system and report back possible issues based on maintenance, performance, security, and standards.",
+    "type":"projects",
+    "keywords":[
+        "code",
+        "check",
+        "checker",
+        "review",
+        "reviewer",
+        "quality",
+        "qa",
+        "test",
+        "maintenance",
+        "performance",
+        "security",
+        "standards"
+    ],
+    "private":false,
+    "projectURL":"https://github.com/Ortus-Solutions/CodeChecker",
+    "license":[
+        {
+            "type":"Apache2",
+            "url":"http://www.apache.org/licenses/LICENSE-2.0.html"
+        }
+    ],
+    "contributors":[
+        "Chris Weller <wellercs@gmail.com>",
+        "Gavin Pickin <gpickin@gmail.com>",
+        "Luis Majano <lmajano@ortussolutions.com",
+        "Brad Wood <brad@ortussolutions.com"
+    ],
+    "dependencies":{
+        "coldbox":"^5.0.0",
+        "codechecker-core":"be"
+    },
+    "ignore":[
+        "**/.*",
+        "tests/**"
+    ],
+    "installPaths":{
+        "coldbox":"coldbox/",
+        "codechecker-core":"modules/codechecker-core"
+    },
+    "location":"forgeboxStorage"
 }
\ No newline at end of file
diff --git a/config/CacheBox.cfc b/config/CacheBox.cfc
deleted file mode 100644
index 8f27b49..0000000
--- a/config/CacheBox.cfc
+++ /dev/null
@@ -1,50 +0,0 @@
-component{
-	
-	/**
-	* Configure CacheBox for ColdBox Application Operation
-	*/
-	function configure(){
-		
-		// The CacheBox configuration structure DSL
-		cacheBox = {
-			// LogBox config already in coldbox app, not needed
-			// logBoxConfig = "coldbox.system.web.config.LogBox", 
-			
-			// The defaultCache has an implicit name "default" which is a reserved cache name
-			// It also has a default provider of cachebox which cannot be changed.
-			// All timeouts are in minutes
-			defaultCache = {
-				objectDefaultTimeout = 120, //two hours default
-				objectDefaultLastAccessTimeout = 30, //30 minutes idle time
-				useLastAccessTimeouts = true,
-				reapFrequency = 5,
-				freeMemoryPercentageThreshold = 0,
-				evictionPolicy = "LRU",
-				evictCount = 1,
-				maxObjects = 300,
-				objectStore = "ConcurrentStore", //guaranteed objects
-				coldboxEnabled = true
-			},
-			
-			// Register all the custom named caches you like here
-			caches = {
-				// Named cache for all coldbox event and view template caching
-				template = {
-					provider = "coldbox.system.cache.providers.CacheBoxColdBoxProvider",
-					properties = {
-						objectDefaultTimeout = 120,
-						objectDefaultLastAccessTimeout = 30,
-						useLastAccessTimeouts = true,
-						freeMemoryPercentageThreshold = 0,
-						reapFrequency = 5,
-						evictionPolicy = "LRU",
-						evictCount = 2,
-						maxObjects = 300,
-						objectStore = "ConcurrentSoftReferenceStore" //memory sensitive
-					}
-				}		
-			}		
-		};
-	}	
-
-}
\ No newline at end of file
diff --git a/config/Coldbox.cfc b/config/Coldbox.cfc
index 9ce357b..749cad9 100644
--- a/config/Coldbox.cfc
+++ b/config/Coldbox.cfc
@@ -1,71 +1,20 @@
 component{
 
-	// Configure ColdBox Application
 	function configure(){
 
-		// coldbox directives
 		coldbox = {
-			//Application Setup
-			appName 				= "CodeChecker",
-			appDescription			= "A package for checking code quality.",
-			appAuthor				= "Chris Weller",
-
-			//Development Settings
-			reinitPassword			= "",
-			handlersIndexAutoReload = false,
-
-			//Implicit Events
-			defaultEvent			= "Main.index",
-			requestStartHandler		= "",
-			requestEndHandler		= "",
-			applicationStartHandler = "",
-			applicationEndHandler	= "",
-			sessionStartHandler 	= "",
-			sessionEndHandler		= "",
-			missingTemplateHandler	= "",
-
-			//Extension Points
-			applicationHelper 			= "includes/helpers/ApplicationHelper.cfm",
-			viewsHelper					= "",
-			modulesExternalLocation		= [],
-			viewsExternalLocation		= "",
-			layoutsExternalLocation 	= "",
-			handlersExternalLocation  	= "",
-			requestContextDecorator 	= "",
-			controllerDecorator			= "",
-
-			//Error/Exception Handling
-			exceptionHandler		= "",
-			onInvalidEvent			= "",
-			customErrorTemplate		= "/coldbox/system/includes/BugReport.cfm",
-
-			//Application Aspects
-			handlerCaching 			= true
 		};
 
-		// custom settings
 		settings = {
-
+			appName 		= "CodeChecker",
+			appDescription	= "A package for checking code quality.",
+			appAuthor		= "Chris Weller"
 		};
 
-		// environment settings, create a detectEnvironment() method to detect it yourself.
-		// create a function with the name of the environment so it can be executed if that environment is detected
-		// the value of the environment is a list of regex patterns to match the cgi.http_host.
 		environments = {
 			development = "localhost,127\.0\.0\.1"
 		};
 
-		// Module Directives
-		modules = {
-			//Turn to false in production
-			autoReload = false,
-			// An array of modules names to load, empty means all of them
-			include = [],
-			// An array of modules names to NOT load, empty means none
-			exclude = []
-		};
-
-		//LogBox DSL
 		logBox = {
 			// Define Appenders
 			appenders = {
@@ -77,71 +26,16 @@
 			info = [ "coldbox.system" ]
 		};
 
-		//Layout Settings
-		layoutSettings = {
-			defaultLayout = "",
-			defaultView   = ""
-		};
-
-		//Interceptor Settings
-		interceptorSettings = {
-			throwOnInvalidStates = false,
-			customInterceptionPoints = ""
-		};
-
-		//Register interceptors as an array, we need order
 		interceptors = [
-			//SES
-			// {class="coldbox.system.interceptors.SES",
-			//  properties={}
-			// },
-			{ class="codechecker.interceptors.GlobalPreProcessor", properties={} }
-		];
-
-		/*
-		// flash scope configuration
-		flash = {
-			scope = "session,client,cluster,ColdboxCache,or full path",
-			properties = {}, // constructor properties for the flash scope implementation
-			inflateToRC = true, // automatically inflate flash data into the RC scope
-			inflateToPRC = false, // automatically inflate flash data into the PRC scope
-			autoPurge = true, // automatically purge flash data for you
-			autoSave = true // automatically save flash scopes at end of a request and on relocations.
-		};
-
-		//Register Layouts
-		layouts = [
-			{ name = "login",
-		 	  file = "Layout.tester.cfm",
-			  views = "vwLogin,test",
-			  folders = "tags,pdf/single"
-			}
+			{ class="codechecker.interceptors.GlobalPreProcessor" }
 		];
 
-		//Conventions
-		conventions = {
-			handlersLocation = "handlers",
-			viewsLocation 	 = "views",
-			layoutsLocation  = "layouts",
-			modelsLocation 	 = "models",
-			eventAction 	 = "index"
-		};
-
-		//Datasources
-		datasources = {
-			mysite   = {name="mySite", dbType="mysql", username="root", password="pass"},
-			blog_dsn = {name="myBlog", dbType="oracle", username="root", password="pass"}
-		};
-		*/
-
 	}
 
-	/**
-	* Development environment
-	*/
 	function development(){
 		coldbox.handlersIndexAutoReload = true;
 		coldbox.handlerCaching = false;
+		coldbox.reinitPassword = "";
 		coldbox.customErrorTemplate = "/coldbox/system/includes/BugReport.cfm";
 	}
 
diff --git a/config/Routes.cfm b/config/Routes.cfm
deleted file mode 100644
index 6b590d1..0000000
--- a/config/Routes.cfm
+++ /dev/null
@@ -1,46 +0,0 @@
-<cfscript>
-	// Allow unique URL or combination of URLs, we recommend both enabled
-	setUniqueURLS(false);
-	// Auto reload configuration, true in dev makes sense to reload the routes on every request
-	//setAutoReload(false);
-	// Sets automatic route extension detection and places the extension in the rc.format variable
-	// setExtensionDetection(true);
-	// The valid extensions this interceptor will detect
-	// setValidExtensions('xml,json,jsont,rss,html,htm');
-	// If enabled, the interceptor will throw a 406 exception that an invalid format was detected or just ignore it
-	// setThrowOnInvalidExtension(true);
-
-	// Base URL
-	if( len(getSetting('AppMapping') ) lte 1){
-		setBaseURL("http://#cgi.HTTP_HOST#/index.cfm");
-	}
-	else{
-		setBaseURL("http://#cgi.HTTP_HOST#/#getSetting('AppMapping')#/index.cfm");
-	}
-
-	// Your Application Routes
-	addRoute(pattern=":handler/:action?");
-
-
-	/** Developers can modify the CGI.PATH_INFO value in advance of the SES
-		interceptor to do all sorts of manipulations in advance of route
-		detection. If provided, this function will be called by the SES
-		interceptor instead of referencing the value CGI.PATH_INFO.
-
-		This is a great place to perform custom manipulations to fix systemic
-		URL issues your Web site may have or simplify routes for i18n sites.
-
-		@Event The ColdBox RequestContext Object
-	**/
-	function PathInfoProvider(Event){
-		/* Example:
-		var URI = CGI.PATH_INFO;
-		if (URI eq "api/foo/bar")
-		{
-			Event.setProxyRequest(true);
-			return "some/other/value/for/your/routes";
-		}
-		*/
-		return CGI.PATH_INFO;
-	}
-</cfscript>
\ No newline at end of file
diff --git a/config/WireBox.cfc b/config/WireBox.cfc
index 9a4998c..43388bb 100644
--- a/config/WireBox.cfc
+++ b/config/WireBox.cfc
@@ -1,47 +1,7 @@
 component extends="coldbox.system.ioc.config.Binder"{
 	
-	/**
-	* Configure WireBox, that's it!
-	*/
 	function configure(){
 		
-		// The WireBox configuration structure DSL
-		wireBox = {
-			// Scope registration, automatically register a wirebox injector instance on any CF scope
-			// By default it registeres itself on application scope
-			scopeRegistration = {
-				enabled = true,
-				scope   = "application", // server, cluster, session, application
-				key		= "wireBox"
-			},
-
-			// DSL Namespace registrations
-			customDSL = {
-				// namespace = "mapping name"
-			},
-			
-			// Custom Storage Scopes
-			customScopes = {
-				// annotationName = "mapping name"
-			},
-			
-			// Package scan locations
-			scanLocations = ["model"],
-			
-			// Stop Recursions
-			stopRecursions = [],
-			
-			// Parent Injector to assign to the configured injector, this must be an object reference
-			parentInjector = "",
-			
-			// Register all event listeners here, they are created in the specified order
-			listeners = [
-				// { class="", name="", properties={} }
-			]			
-		};
-		
-		// Map Models Automatically with aliases
-		mapDirectory( packagePath="codechecker.models" );
 	}	
 
 }
\ No newline at end of file
diff --git a/config/rules/bp.casesensitivity.rules.json b/config/rules/bp.casesensitivity.rules.json
deleted file mode 100644
index 127c668..0000000
--- a/config/rules/bp.casesensitivity.rules.json
+++ /dev/null
@@ -1,171 +0,0 @@
-[
-    {
-        "pattern": "arrayContains\\(",
-        "message": "arrayContains() is Case Sensitive - try arrayContainsNoCase() instead",
-        "componentname": "CodeChecker",
-        "category": "Case Sensitive Functions - Best Practices",
-        "name": "arrayContains()",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "arrayFindAll\\(",
-        "message": "arrayFindAll() is Case Sensitive - try arrayFindAllNoCase() instead",
-        "componentname": "CodeChecker",
-        "category": "Case Sensitive Functions - Best Practices",
-        "name": "arrayFindAll()",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "arrayFind\\(",
-        "message": "arrayFind() is Case Sensitive - try arrayFindNoCase() instead",
-        "componentname": "CodeChecker",
-        "category": "Case Sensitive Functions - Best Practices",
-        "name": "arrayFind()",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "compare\\(",
-        "message": "compare() is Case Sensitive - try compareNoCase() instead",
-        "componentname": "CodeChecker",
-        "category": "Case Sensitive Functions - Best Practices",
-        "name": "compare()",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "find\\(",
-        "message": "find() is Case Sensitive - try findNoCase() instead",
-        "componentname": "CodeChecker",
-        "category": "Case Sensitive Functions - Best Practices",
-        "name": "find()",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "listContains\\(",
-        "message": "listContains() is Case Sensitive - try listContainsNoCase() instead",
-        "componentname": "CodeChecker",
-        "category": "Case Sensitive Functions - Best Practices",
-        "name": "listContains()",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "listFind\\(",
-        "message": "listFind() is Case Sensitive - try listFindNoCase() instead",
-        "componentname": "CodeChecker",
-        "category": "Case Sensitive Functions - Best Practices",
-        "name": "listFind()",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "listValueCount\\(",
-        "message": "listValueCount() is Case Sensitive - try listValueCountNoCase() instead",
-        "componentname": "CodeChecker",
-        "category": "Case Sensitive Functions - Best Practices",
-        "name": "listValueCount()",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "REFind\\(",
-        "message": "REFind() is Case Sensitive - try REFindNoCase() instead",
-        "componentname": "CodeChecker",
-        "category": "Case Sensitive Functions - Best Practices",
-        "name": "REFind()",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "REMatch\\(",
-        "message": "REMatch() is Case Sensitive - try REMatchNoCase() instead",
-        "componentname": "CodeChecker",
-        "category": "Case Sensitive Functions - Best Practices",
-        "name": "REMatch()",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "replace\\(",
-        "message": "replace() is Case Sensitive - try replaceNoCase() instead",
-        "componentname": "CodeChecker",
-        "category": "Case Sensitive Functions - Best Practices",
-        "name": "replace()",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "REReplace\\(",
-        "message": "REReplace() is Case Sensitive - try REReplaceNoCase() instead",
-        "componentname": "CodeChecker",
-        "category": "Case Sensitive Functions - Best Practices",
-        "name": "REReplace()",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    }
-    
-]
\ No newline at end of file
diff --git a/config/rules/bp.securityrisks.rules.json b/config/rules/bp.securityrisks.rules.json
deleted file mode 100644
index 1e8e1db..0000000
--- a/config/rules/bp.securityrisks.rules.json
+++ /dev/null
@@ -1,283 +0,0 @@
-[
-    {
-        "pattern": "<cfexecute\\s+",
-        "message": "cfexecute tag - Executes a CFML developer-specified process on a server computer.",
-        "componentname": "CodeChecker",
-        "category": "Security Risks - Best Practices",
-        "name": "cfexecute tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "cfexecute\\(",
-        "message": "cfexecute script - Executes a CFML developer-specified process on a server computer.",
-        "componentname": "CodeChecker",
-        "category": "Security Risks - Best Practices",
-        "name": "cfexecute script",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cffile\\s+",
-        "message": "cffile tag - Manages interactions with server files. Different combinations cause different attributes to be required.",
-        "componentname": "CodeChecker",
-        "category": "Security Risks - Best Practices",
-        "name": "cffile tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "fileRead\\(",
-        "message": "fileRead script - Manages interactions with server files. Different combinations cause different attributes to be required.",
-        "componentname": "CodeChecker",
-        "category": "Security Risks - Best Practices",
-        "name": "fileRead script",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cffileupload\\s+",
-        "message": "cffileupload tag - Uploads files to server",
-        "componentname": "CodeChecker",
-        "category": "Security Risks - Best Practices",
-        "name": "cffileupload tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "cffileupload\\(",
-        "message": "cffileupload script - Uploads files to server",
-        "componentname": "CodeChecker",
-        "category": "Security Risks - Best Practices",
-        "name": "cffileupload script",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfftp\\s+",
-        "message": "cfftp tag - Lets users implement File Transfer Protocol (FTP) operations.",
-        "componentname": "CodeChecker",
-        "category": "Security Risks - Best Practices",
-        "name": "cfftp tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "cfftp\\(",
-        "message": "cfftp script - Lets users implement File Transfer Protocol (FTP) operations.",
-        "componentname": "CodeChecker",
-        "category": "Security Risks - Best Practices",
-        "name": "cfftp script",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfdirectory\\s+",
-        "message": "cfdirectory tag - Allows you to list, create, delete or rename a directory in the server file system.",
-        "componentname": "CodeChecker",
-        "category": "Security Risks - Best Practices",
-        "name": "cfdirectory tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "directoryList\\(",
-        "message": "directoryList script - Allows you to list, create, delete or rename a directory in the server file system.",
-        "componentname": "CodeChecker",
-        "category": "Security Risks - Best Practices",
-        "name": "directoryList script",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfregistry\\s+",
-        "message": "cfregistry tag - Reads, writes, and deletes keys and values in the system registry.",
-        "componentname": "CodeChecker",
-        "category": "Security Risks - Best Practices",
-        "name": "cfregistry tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "cfregistry\\(",
-        "message": "cfregistry script - Reads, writes, and deletes keys and values in the system registry.",
-        "componentname": "CodeChecker",
-        "category": "Security Risks - Best Practices",
-        "name": "cfregistry script",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfadmin\\s+",
-        "message": "cfadmin tag - Used for all changes one wants to do in the Railo configuration",
-        "componentname": "CodeChecker",
-        "category": "Security Risks - Best Practices",
-        "name": "cfadmin tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "cfadmin\\(",
-        "message": "cfadmin script - Used for all changes one wants to do in the Railo configuration",
-        "componentname": "CodeChecker",
-        "category": "Security Risks - Best Practices",
-        "name": "cfadmin script",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfhttp\\s+",
-        "message": "cfhttp tag - Generates an HTTP request and handles the response from the server.",
-        "componentname": "CodeChecker",
-        "category": "Security Risks - Best Practices",
-        "name": "cfhttp tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "cfhttp\\(",
-        "message": "cfhttp script - Generates an HTTP request and handles the response from the server.",
-        "componentname": "CodeChecker",
-        "category": "Security Risks - Best Practices",
-        "name": "cfhttp script",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "createObject\\(.*\\042.*java.*\\042",
-        "message": "createObject - Create Java Object",
-        "componentname": "CodeChecker",
-        "category": "Security Risks - Best Practices",
-        "name": "createObject script",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "createObject\\(.*'.*java.*'",
-        "message": "createObject - Create Java Object",
-        "componentname": "CodeChecker",
-        "category": "Security Risks - Best Practices",
-        "name": "createObject script",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfobject\\s+'.*java.*'|<cfobject\\s+\\042.*java.*\\042",
-        "message": "cfobject tag - Create Java Object",
-        "componentname": "CodeChecker",
-        "category": "Security Risks - Best Practices",
-        "name": "cfobject tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "cfobject\\(.*'.*java.*'|cfobject\\(.*\\042.*java.*\\042",
-        "message": "cfobject script - Create Java Object",
-        "componentname": "CodeChecker",
-        "category": "Security Risks - Best Practices",
-        "name": "cfobject script",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    }
-    
-]    
\ No newline at end of file
diff --git a/config/rules/core.extra.rules.json b/config/rules/core.extra.rules.json
deleted file mode 100644
index 9a1c043..0000000
--- a/config/rules/core.extra.rules.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-    {
-        "pattern": "",
-        "message": "All query variables should utilize cfqueryparam. This helps prevent sql injection. It also increases query performance by caching the execution plan.",
-        "componentname": "QueryParamScanner.qpscanner",
-        "category": "QueryParamScanner",
-        "name": "Missing cfqueryparam",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": true,
-        "tagname": "",
-        "functionname": "go"
-    },
-    {
-        "pattern": "",
-        "message": "All CFC variables should be scoped in order to prevent memory leaks.",
-        "componentname": "VarScoper.varScoper",
-        "category": "VarScoper",
-        "name": "Unscoped CFC variable",
-        "passonmatch": false,
-        "extensions": "cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": true,
-        "tagname": "",
-        "functionname": "runVarscoper"
-    }
-]
\ No newline at end of file
diff --git a/config/rules/core.maintenance.rules.json b/config/rules/core.maintenance.rules.json
deleted file mode 100644
index 6167eb7..0000000
--- a/config/rules/core.maintenance.rules.json
+++ /dev/null
@@ -1,58 +0,0 @@
-[
-    {
-        "pattern": "<cfabort|abort;",
-        "message": "Remove cfabort",
-        "componentname": "CodeChecker",
-        "category": "Maintenance",
-        "name": "Don't use Abort",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfdump|writeDump\\(",
-        "message": "Remove cfdump",
-        "componentname": "CodeChecker",
-        "category": "Maintenance",
-        "name": "Don't use Dump",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cflog|writeLog\\(",
-        "message": "Remove cflog",
-        "componentname": "CodeChecker",
-        "category": "Maintenance",
-        "name": "Don't use Log",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "2",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "console\\.log\\(",
-        "message": "Remove console log",
-        "componentname": "CodeChecker",
-        "category": "Maintenance",
-        "name": "Don't use Console Log",
-        "passonmatch": false,
-        "extensions": "cfm,js",
-        "severity": "1",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    }
-]
\ No newline at end of file
diff --git a/config/rules/core.performance.rules.json b/config/rules/core.performance.rules.json
deleted file mode 100644
index 8ccaa27..0000000
--- a/config/rules/core.performance.rules.json
+++ /dev/null
@@ -1,156 +0,0 @@
-[
-    {
-        "pattern": "<cflock[\\w\\W]+<cflock[\\w\\W]+</cflock",
-        "message": "Avoid nesting cflock as it can lead to long-running code and can cause deadlocks.",
-        "componentname": "CodeChecker",
-        "category": "Performance",
-        "name": "Don't nest cflock tags",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "3",
-        "customcode": "",
-        "bulkcheck": true,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "parameterExists\\(",
-        "message": "Prefer StructKeyExists() over ParameterExists()",
-        "componentname": "CodeChecker",
-        "category": "Performance",
-        "name": "Don't use ParameterExists",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "3",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "isDefined\\(",
-        "message": "Prefer StructKeyExists() over IsDefined()",
-        "componentname": "CodeChecker",
-        "category": "Performance",
-        "name": "Don't use IsDefined",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "3",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "Evaluate(?=\\()",
-        "message": "Avoid Evaluate().",
-        "componentname": "CodeChecker",
-        "category": "Performance",
-        "name": "Don't use Evaluate method",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "[^\\w]DE(?=\\()",
-        "message": "Avoid DE().",
-        "componentname": "CodeChecker",
-        "category": "Performance",
-        "name": "Don't use DE method",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "iif(?=\\()",
-        "message": "Always use cfif/cfelse instead of iif(). It is significantly faster and more readable.",
-        "componentname": "CodeChecker",
-        "category": "Performance",
-        "name": "Don't use iif method",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "StructFind(?=\\()",
-        "message": "Always use struct.key or struct[key] instead of structFind(struct, key). They are significantly faster and more readable.",
-        "componentname": "CodeChecker",
-        "category": "Performance",
-        "name": "Don't use StructFind method",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "DecrementValue(?=\\()",
-        "message": "Always use x = x - 1 or x-- instead of x = decrementValue(x). It is more readable and slightly faster.",
-        "componentname": "CodeChecker",
-        "category": "Performance",
-        "name": "Don't use DecrementValue method",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "IncrementValue(?=\\()",
-        "message": "Always use x = x + 1 or x++ instead of x = incrementValue(x). It is more readable and slightly faster.",
-        "componentname": "CodeChecker",
-        "category": "Performance",
-        "name": "Don't use IncrementValue method",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "is\\s+\\042\\042|eq\\s+\\042\\042|is\\s+not\\s+\\042\\042|neq\\s+\\042\\042|is\\s+\\047\\047|eq\\s+\\047\\047|is\\s+not\\s+\\047\\047|neq\\s+\\047\\047",
-        "message": "Always use len() instead of is \", eq \", is not \", neq \"",
-        "componentname": "CodeChecker",
-        "category": "Performance",
-        "name": "Use Len method",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "3",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "setVariable\\(",
-        "message": "Prefer set tag/script over SetVariable()",
-        "componentname": "CodeChecker",
-        "category": "Performance",
-        "name": "Don't use SetVariable",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "3",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    }
-]
\ No newline at end of file
diff --git a/config/rules/core.standards.rules.json b/config/rules/core.standards.rules.json
deleted file mode 100644
index d1032e3..0000000
--- a/config/rules/core.standards.rules.json
+++ /dev/null
@@ -1,184 +0,0 @@
-[
-    {
-        "pattern": "<cfquery\\s+",
-        "message": "Remove inline query. Queries should be encapsulated in the model/service layer.",
-        "componentname": "CodeChecker",
-        "category": "Standards",
-        "name": "Don't use cfquery in a cfm page",
-        "passonmatch": false,
-        "extensions": "cfm",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "\\b(form|application|url|session|cgi|client|request|cookie)(?=(\\[|\\.\\w))",
-        "message": "Avoid using shared scope variables from within a CFC as it breaks encapsulation.",
-        "componentname": "CodeChecker",
-        "category": "Standards",
-        "name": "Don't use shared scope variables in a CFC",
-        "passonmatch": false,
-        "extensions": "cfc",
-        "severity": "4",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "is\\s+true|is\\s+not\\s+true|is\\s+false|is\\s+not\\s+false",
-        "message": "Avoid using IS for boolean tests.",
-        "componentname": "CodeChecker",
-        "category": "Standards",
-        "name": "Don't use IS or GT for boolean tests",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "3",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "is\\s+[0-9]+|is\\s+not\\s+[0-9]+|eq\\s+\\042[A-Za-z]+\\042|eq\\s+\\042[0-9]+\\042|neq\\s+\\042[A-Z][a-z]+\\042|neq\\s+\\042[0-9]+\\042",
-        "message": "Use IS/IS NOT for string comparisons and EQ/NEQ for numeric comparisons.",
-        "componentname": "CodeChecker",
-        "category": "Standards",
-        "name": "Illogical comparison operator",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "3",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "\\+\\s+\\042[0-9]\\042|\\-\\s+\\042[0-9]\\042|\\*\\s+\\042[0-9]\\042|\\/\\s+\\042[0-9]\\042|\\%\\s+\\042[0-9]\\042",
-        "message": "Mathematical operators should be used with numbers instead of strings.",
-        "componentname": "CodeChecker",
-        "category": "Standards",
-        "name": "Illogical mathematical operator",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "3",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "\\&\\s+[0-9]",
-        "message": "The ampersand contcatenator should be used with strings instead of numbers.",
-        "componentname": "CodeChecker",
-        "category": "Standards",
-        "name": "Illogical concatenation",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "3",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfcatch[\\W]+[^\\<cf][\\W]+</cfcatch|<cfcatch></cfcatch>|<cfcatch>\\W+</cfcatch>",
-        "message": "Catch blocks should not be empty.",
-        "componentname": "CodeChecker",
-        "category": "Standards",
-        "name": "Empty catch block",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "3",
-        "customcode": "",
-        "bulkcheck": true,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": ".*output=\\042\\s*true\\s*\\042|.*output=\\s*true\\s*",
-        "message": "Output attribute of components and functions should be set to false.",
-        "componentname": "CodeChecker",
-        "category": "Standards",
-        "name": "Avoid using output=true in cfcomponent and cffunction",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "3",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "cfcomponent|cffunction",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "function init\\(|<cffunction.*name=\\042init\\042",
-        "message": "Every CFC should have an init method.",
-        "componentname": "CodeChecker",
-        "category": "Standards",
-        "name": "Use init method in CFC",
-        "passonmatch": true,
-        "extensions": "cfc",
-        "severity": "3",
-        "customcode": "",
-        "bulkcheck": true,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "function onMissingMethod\\(|<cffunction.*name=\\042onMissingMethod\\042",
-        "message": "Every CFC should have an onMissingMethod method.",
-        "componentname": "CodeChecker",
-        "category": "Standards",
-        "name": "Use onMissingMethod method in CFC",
-        "passonmatch": true,
-        "extensions": "cfc",
-        "severity": "3",
-        "customcode": "",
-        "bulkcheck": true,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": ".*hint=\\042\\w+.*\\042",
-        "message": "Hints appear in the auto-generated CFC documentation and aid in documenting your code.",
-        "componentname": "CodeChecker",
-        "category": "Standards",
-        "name": "Use hint attribute of cfcomponent, cffunction, cfargument",
-        "passonmatch": true,
-        "extensions": "cfm,cfc",
-        "severity": "1",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "cfcomponent|cffunction|cfargument",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "ArrayNew\\(1\\)",
-        "message": "Avoid ArrayNew(1). Simply use [].",
-        "componentname": "CodeChecker",
-        "category": "Standards",
-        "name": "Don't use ArrayNew(1) function",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "1",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "datasource=.*arguments",
-        "message": "Use variables-scoped datasource since the datasource should be set on object instantiation.",
-        "componentname": "CodeChecker",
-        "category": "Standards",
-        "name": "Don't use arguments-scoped datasource",
-        "passonmatch": false,
-        "extensions": "cfc",
-        "severity": "1",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    }
-]
\ No newline at end of file
diff --git a/config/rules/disabled/core.security.rules.json b/config/rules/disabled/core.security.rules.json
deleted file mode 100644
index 9a16bfc..0000000
--- a/config/rules/disabled/core.security.rules.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-    {
-        "pattern": "\\b(client)(?=(\\[|\\.\\w))",
-        "message": "Avoid using client scoped variables from within a CFM. Use session instead.",
-        "componentname": "CodeChecker",
-        "category": "Security",
-        "name": "Don't use client scoped variables in a CFM",
-        "passonmatch": false,
-        "extensions": "cfm",
-        "severity": "4",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cffile|<input.*type=\\042file\\042",
-        "message": "Warning: Ensure that file uploads use accept attribute and check for valid file extension and MIME type. For image files, also use IsImage().",
-        "componentname": "CodeChecker",
-        "category": "Security",
-        "name": "File upload warning",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    }
-]
\ No newline at end of file
diff --git a/config/rules/lucee.missingtags.rules.json b/config/rules/lucee.missingtags.rules.json
deleted file mode 100644
index 6a74ec3..0000000
--- a/config/rules/lucee.missingtags.rules.json
+++ /dev/null
@@ -1,296 +0,0 @@
-[
-    {
-        "pattern": "<cfapplet\\s+",
-        "message": "cfapplet tag is not supported in Lucee",
-        "componentname": "CodeChecker",
-        "category": "LuceeMissingTags",
-        "name": "cfapplet Tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfcalendar\\s+",
-        "message": "cfcalendar tag is not supported in Lucee",
-        "componentname": "CodeChecker",
-        "category": "LuceeMissingTags",
-        "name": "cfcalendar Tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfexchange\\s+",
-        "message": "cfexchange* tags are not supported in Lucee",
-        "componentname": "CodeChecker",
-        "category": "LuceeMissingTags",
-        "name": "cfexchange* Tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cffileupload\\s+",
-        "message": "cffileupload tag is not supported in Lucee",
-        "componentname": "CodeChecker",
-        "category": "LuceeMissingTags",
-        "name": "cffileupload Tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfformgroup\\s+",
-        "message": "cfformgroup tag is not supported in Lucee",
-        "componentname": "CodeChecker",
-        "category": "LuceeMissingTags",
-        "name": "cfformgroup Tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfformitem\\s+",
-        "message": "cfformitem tag is not supported in Lucee",
-        "componentname": "CodeChecker",
-        "category": "LuceeMissingTags",
-        "name": "cfformitem Tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfgraph\\s+",
-        "message": "cfgraph tag is not supported in Lucee",
-        "componentname": "CodeChecker",
-        "category": "LuceeMissingTags",
-        "name": "cfgraph Tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfgrid\\s+",
-        "message": "cfgrid* tags are not supported in Lucee",
-        "componentname": "CodeChecker",
-        "category": "LuceeMissingTags",
-        "name": "cfgrid* Tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfmenu\\s+",
-        "message": "cfmenu* tags are not supported in Lucee",
-        "componentname": "CodeChecker",
-        "category": "LuceeMissingTags",
-        "name": "cfmenu* Tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfNTauthenticate\\s+",
-        "message": "cfNTauthenticate tag is not supported in Lucee",
-        "componentname": "CodeChecker",
-        "category": "LuceeMissingTags",
-        "name": "cfNTauthenticate Tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfpdfform\\s+",
-        "message": "cfpdfform tag is not supported in Lucee",
-        "componentname": "CodeChecker",
-        "category": "LuceeMissingTags",
-        "name": "cfpdfform Tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfpdfformparam\\s+",
-        "message": "cfpdfformparam tag is not supported in Lucee",
-        "componentname": "CodeChecker",
-        "category": "LuceeMissingTags",
-        "name": "cfpdfformparam Tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfpod\\s+",
-        "message": "cfpod tag is not supported in Lucee",
-        "componentname": "CodeChecker",
-        "category": "LuceeMissingTags",
-        "name": "cfpod Tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfpresent\\s+",
-        "message": "cfpresent* tags are not supported in Lucee",
-        "componentname": "CodeChecker",
-        "category": "LuceeMissingTags",
-        "name": "cfpresent* Tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfprint\\s+",
-        "message": "cfprint tag is not supported in Lucee",
-        "componentname": "CodeChecker",
-        "category": "LuceeMissingTags",
-        "name": "cfprint Tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfreport\\s+",
-        "message": "cfreport* tags are not supported in Lucee",
-        "componentname": "CodeChecker",
-        "category": "LuceeMissingTags",
-        "name": "cfreport* Tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfspreadsheet\\s+",
-        "message": "cfspreadsheet tag is not supported in Lucee",
-        "componentname": "CodeChecker",
-        "category": "LuceeMissingTags",
-        "name": "cfspreadsheet Tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cfsprydataset\\s+",
-        "message": "cfsprydataset tag is not supported in Lucee",
-        "componentname": "CodeChecker",
-        "category": "LuceeMissingTags",
-        "name": "cfsprydataset Tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cftextarea\\s+",
-        "message": "cftextarea tag is not supported in Lucee",
-        "componentname": "CodeChecker",
-        "category": "LuceeMissingTags",
-        "name": "cftextarea Tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cftooltip\\s+",
-        "message": "cftooltip tag is not supported in Lucee",
-        "componentname": "CodeChecker",
-        "category": "LuceeMissingTags",
-        "name": "cftooltip Tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    },
-    {
-        "pattern": "<cftree\\s+",
-        "message": "cftree tag is not supported in Lucee",
-        "componentname": "CodeChecker",
-        "category": "LuceeMissingTags",
-        "name": "cftree Tag",
-        "passonmatch": false,
-        "extensions": "cfm,cfc",
-        "severity": "5",
-        "customcode": "",
-        "bulkcheck": false,
-        "tagname": "",
-        "functionname": "checkCode"
-    }
-]
\ No newline at end of file
diff --git a/handlers/Main.cfc b/handlers/Main.cfc
index 241df1e..e7444ab 100644
--- a/handlers/Main.cfc
+++ b/handlers/Main.cfc
@@ -1,21 +1,9 @@
-/**
-* I am a new handler
-*/
 component{
 
 	// DI
-	property name='codeCheckerService' 	inject='codeCheckerService';
-	property name='rulesService' 		inject='rulesService';
-	
-	// OPTIONAL HANDLER PROPERTIES
-	this.prehandler_only 	= "";
-	this.prehandler_except 	= "";
-	this.posthandler_only 	= "";
-	this.posthandler_except = "";
-	this.aroundHandler_only = "";
-	this.aroundHandler_except = "";		
-	// REST Allowed HTTP Methods Ex: this.allowedMethods = {delete='POST,DELETE',index='GET'}
-	this.allowedMethods = {};
+	property name='codeCheckerService' 	inject='codeCheckerService@codechecker-core';
+	property name='rulesService' 		inject='rulesService@codechecker-core';
+	property name='ExportService' 		inject='ExportService@codechecker-core';
 	
 	function preHandler( event, rc, prc, action, eventArguments ){
 		event.setValue( name='pageTitle', value='Code Checker Form', private=true );
@@ -32,7 +20,7 @@ component{
 	}
 	
 	function print(event,rc,prc){
-		prc.categoryList = rulesService.getCategories();
+		prc.binary = ExportService.generateExcelReport( session.results, session.categories );
 		event.setView("main/print");
 	}
 
@@ -43,6 +31,9 @@ component{
 		var sTime = getTickCount();
 		// param incoming data
 		param name="rc.categories" default="";
+		if( rc.categories == '_all' ) {
+			rc.categories = rulesService.getCategories().toList();
+		}
 		prc.errors = [];
 
 		// verify categories
@@ -72,7 +63,7 @@ component{
 			return index( argumentCollection=arguments );
 		}
 		else {
-			prc.checkFiles 		= listToArray( rc.txaCheckFiles, "#chr(10)#, #chr(13)#" );
+			prc.checkFiles 		= listToArray( rc.txaCheckFiles, chr(13) & chr(10) );
 			prc.checkedFiles 	= [];
 			prc.failedFiles 	= [];
 			prc.results 		= [];
@@ -97,34 +88,4 @@ component{
 		}
 	}	
 
-	/************************************** IMPLICIT ACTIONS *********************************************/
-
-	function onAppInit(event,rc,prc){
-
-	}
-
-	function onRequestStart(event,rc,prc){
-
-	}
-
-	function onRequestEnd(event,rc,prc){
-
-	}
-
-	function onSessionStart(event,rc,prc){
-
-	}
-
-	function onSessionEnd(event,rc,prc){
-		var sessionScope = event.getValue("sessionReference");
-		var applicationScope = event.getValue("applicationReference");
-	}
-
-	function onException(event,rc,prc){
-		//Grab Exception From private request collection, placed by ColdBox Exception Handling
-		var exception = prc.exception;
-		//Place exception handler below:
-
-	}
-
 }
diff --git a/includes/helpers/ApplicationHelper.cfm b/includes/helpers/ApplicationHelper.cfm
deleted file mode 100644
index 350262a..0000000
--- a/includes/helpers/ApplicationHelper.cfm
+++ /dev/null
@@ -1 +0,0 @@
-<!--- All methods in this helper will be available in all handlers,views & layouts --->
\ No newline at end of file
diff --git a/includes/i18n/i18n_goes_here.txt b/includes/i18n/i18n_goes_here.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/layouts/Main.cfm b/layouts/Main.cfm
index 08871c2..c091bd8 100644
--- a/layouts/Main.cfm
+++ b/layouts/Main.cfm
@@ -1 +1 @@
-<cfoutput>
#html.doctype()#
<html lang="en">
<head>
	<meta charset="utf-8">
	<title>#prc.pageTitle#</title>
	<meta name="description" content="#prc.pageDescription#">
	<meta name="author" content="#prc.pageAuthor#">
	<!---Base URL --->
	<!--- <base href="#getSetting("HTMLBaseURL")#" /> --->
	<!---css --->
	<link href="includes/css/bootstrap.min.css" rel="stylesheet">
	<link href="includes/css/bootstrap.override.css" rel="stylesheet">
	<!---js --->
    <script src="includes/js/jquery.js"></script>
	<script src="includes/js/bootstrap.min.js"></script>
	<style>
	 /* Utility */
	.centered { text-align: center !important; }
	.inline{ display: inline !important; }
	.margin10{ margin: 10px; }
	.padding10{ padding: 10px; }
	.margin0{ margin: 0px; }
	.padding0{ padding: 0px; }
	.footer {
	  margin-top: 45px;
	  padding: 35px 35px;
	  border-top: 1px solid ##e5e5e5;
	}
	.footer p {
	  margin-bottom: 0;
	  color: ##555;
	}
	body{ padding-top: 50px; }
	</style>
</head>
<body data-spy="scroll">
	<!---Top NavBar --->
	<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
		<div class="container-fluid">
			<!---Brand --->
			<div class="navbar-header">
				<!---Responsive Design --->
				<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="##navbar-collapse">
					<span class="sr-only">Toggle navigation</span>
				    <span class="icon-bar"></span>
				    <span class="icon-bar"></span>
				    <span class="icon-bar"></span>
				</button>
				<!---Branding --->
				<a class="navbar-brand" href="#event.buildLink( 'main' )#"><strong>#prc.appName#</strong></a>
			</div>
		</div> <!---end container --->
	</nav> <!---end navbar --->

	<!---Container And Views --->
	<div class="container">#renderView()#</div>

	<footer class="footer">
		<p class="pull-right">
			<a href="##"><i class="glyphicon glyphicon-arrow-up"></i> Back to top</a>
		</p>
	</footer>
</body>
</html>
</cfoutput>
\ No newline at end of file
+<cfoutput>
#html.doctype()#
<html lang="en">
<head>

	<meta charset="utf-8">
	<title>#prc.pageTitle#</title>
	<meta name="description" content="#prc.pageDescription#">
	<meta name="author" content="#prc.pageAuthor#">
	<!---Base URL --->
	<base href="#event.getHTMLBaseURL()#" />
	<!---css --->
	<link href="includes/css/bootstrap.min.css" rel="stylesheet">
	<link href="includes/css/bootstrap.override.css" rel="stylesheet">
	<!---js --->
    <script src="includes/js/jquery.js"></script>
	<script src="includes/js/bootstrap.min.js"></script>
	<style>
	 /* Utility */
	.centered { text-align: center !important; }
	.inline{ display: inline !important; }
	.margin10{ margin: 10px; }
	.padding10{ padding: 10px; }
	.margin0{ margin: 0px; }
	.padding0{ padding: 0px; }
	.footer {
	  margin-top: 45px;
	  padding: 35px 35px;
	  border-top: 1px solid ##e5e5e5;
	}
	.footer p {
	  margin-bottom: 0;
	  color: ##555;
	}
	body{ padding-top: 50px; }
	</style>
</head>
<body data-spy="scroll">
	<!---Top NavBar --->
	<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
		<div class="container-fluid">
			<!---Brand --->
			<div class="navbar-header">
				<!---Responsive Design --->
				<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="##navbar-collapse">
					<span class="sr-only">Toggle navigation</span>
				    <span class="icon-bar"></span>
				    <span class="icon-bar"></span>
				    <span class="icon-bar"></span>
				</button>
				<!---Branding --->
				<a class="navbar-brand" href="#event.buildLink( 'main' )#"><strong>#prc.appName#</strong></a>
			</div>
		</div> <!---end container --->
	</nav> <!---end navbar --->

	<!---Container And Views --->
	<div class="container">#renderView()#</div>

	<footer class="footer">
		<p class="pull-right">
			<a href="##"><i class="glyphicon glyphicon-arrow-up"></i> Back to top</a>
		</p>
	</footer>
</body>
</html>
</cfoutput>
\ No newline at end of file
diff --git a/lib/drop_jars_here.txt b/lib/drop_jars_here.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/models/CodeCheckerService.cfc b/models/CodeCheckerService.cfc
deleted file mode 100644
index bf8c0a9..0000000
--- a/models/CodeCheckerService.cfc
+++ /dev/null
@@ -1,229 +0,0 @@
-/**
-* I provide functions for checking code quality.
-*/
-component accessors="true"{
-
-	// properties
-	property name="categories" 	type="string";
-	property name="results" 	type="array";
-	property name="rules" 		type="array";
-
-	/**
-	* I initialize the component.
-	* @rulesService I am the Rules service object.
-	* @utilService I am the Utility service object.
-	* @wirebox Instance of WireBox
-	* @categories I am a comma separated list of categories, _ALL for all categories.
-	*/
-	CodeCheckerService function init( 
-		required any rulesService inject="RulesService", 
-		required any utilService inject="UtilService",
-		required any wireBox inject="wirebox",
-		string categories = "" 
-	){
-		// init properties
-		variables.results 		= [];
-		// Init DI
-		variables.rulesService 	= arguments.rulesService;
-		variables.wirebox 		= arguments.wirebox;
-		variables.utilService 	= arguments.utilService;
-		variables.categories 	= arguments.categories;
-		variables.rules 			= arguments.rulesService.getRules();
-
-		return this;
-	}
-
-	/**
-	* I return whether the code check passed or failed.
-	* @line I am the line of code for which to check.
-	* @passonmatch I determine whether to pass or fail if the pattern is matched.
-	* @pattern I am the pattern of code for which to check.
-	*/
-	public boolean function checkCode( required string line, required boolean passonmatch, required string pattern ) {
-		if ( ( REFindNoCase( arguments.pattern, arguments.line ) AND NOT arguments.passonmatch ) OR ( NOT REFindNoCase( arguments.pattern, arguments.line ) AND arguments.passonmatch ) ) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	* I start the code review.
-	* @filepath I am the directory or file path for which to review.
-	* @recurse I determine whether or not to review recursively.
-	*/
-	public array function startCodeReview( required string filepath, boolean recurse = true ) {
-		if ( DirectoryExists(arguments.filepath) ) {
-			// path, recurse, listInfo, filter, sort
-			// TODO: DirectoryList() should filter on type=file
-			local.qryFiles = DirectoryList(arguments.filepath, arguments.recurse, "query");
-			for ( local.row = 1; local.row LTE local.qryFiles.recordcount; local.row++ ) {
-				if ( local.qryFiles.type[local.row] IS "File" ) {
-					local.filePath = "#local.qryFiles.directory[local.row]#/#local.qryFiles.name[local.row]#";
-					readFile(filepath=local.filePath);
-					if ( variables.categories IS "_ALL" OR ListFind( variables.categories, 'QueryParamScanner') ) {
-						runQueryParamScanner(filepath=local.filePath);
-					}
-					if ( variables.categories IS "_ALL" OR ListFind( variables.categories, 'VarScoper') ) {
-						runVarScoper(filepath=local.filePath)
-					}
-				}
-			}
-		}
-		else if ( FileExists(arguments.filepath) ) {
-			local.filePath = arguments.filepath;
-			readFile(filepath=local.filePath);
-			if ( variables.categories IS "_ALL" OR ListFind( variables.categories, 'QueryParamScanner') ) {
-				runQueryParamScanner(filepath=local.filePath);
-			}
-			if ( variables.categories IS "_ALL" OR ListFind( variables.categories, 'VarScoper') ) {
-				runVarScoper(filepath=local.filePath)
-			}
-		}
-		return variables.results;
-	}
-
-	/**
-	* I read the file and run the rules against the file.
-	* @filepath I am the file path for which to review.
-	*/
-	public void function readFile( required string filepath ) {
-		local.dataFile = fileOpen( arguments.filepath, "read" );
-		local.lineNumber = 0;
-		while ( !fileIsEOF( local.dataFile ) ) {
-			local.lineNumber++;
-			local.line = fileReadLine( local.dataFile );
-			// run rules on each line
-			runRules(filepath=arguments.filepath, line=local.line, linenumber=local.lineNumber, categories=variables.categories);
-			if ( fileIsEOF( local.dataFile ) ) {
-				// run rules on whole file. useful for rules where you are just testing the existence of something.
-				runRules(filepath=arguments.filepath);
-			}
-		}
-		fileClose( local.dataFile );		
-	}
-
-	/**
-	* I run the code review rules for the line of code.
-	* @filepath I am the file path for which to review.
-	* @line I am the line of code for which to review.
-	* @linenumber I am the line number of the code for which to review.
-	* @categories I am a comma separated list of categories, _ALL for all categories.
-	*/
-	public void function runRules( required string filepath, string line, numeric linenumber, string categories = "" ) {
-		local.standardizedfilepath = Replace(arguments.filepath, "\", "/", "all");
-		local.file = ListLast(local.standardizedfilepath, "/");
-		local.directory = Replace(local.standardizedfilepath, local.file, "");
-		local.fileextension = ListLast(local.file, ".");
-		for ( local.ruleitem in variables.rules ) {
-			// backwards compat support for v1
-			if ( local.ruleitem.componentname IS "CodeChecker" ) {
-				local.ruleitem.componentname = "CodeCheckerService";
-			}	
-			if ( arguments.categories IS "_ALL" OR ListFind( arguments.categories, local.ruleitem["category"] ) ) {
-				if ( NOT ListFindNoCase(local.ruleitem.extensions, local.fileextension, ",") ) {
-					continue;
-				}
-				if ( StructKeyExists(arguments,"line") AND NOT local.ruleitem.bulkcheck AND NOT ListLen(local.ruleitem.tagname,"|") ) {
-					local.codeCheckerReturn = variables.utilService._invoke(
-																	obj = local.ruleitem.componentname,
-																	fn = local.ruleitem.functionname,
-																	args = {
-																		line = arguments.line,
-																		passonmatch = local.ruleitem.passonmatch,
-																		pattern = local.ruleitem.pattern
-																	}
-																);
-					if ( NOT local.codeCheckerReturn ) {
-						recordResult(directory=local.directory, file=local.file, rule=local.ruleitem.name, message=local.ruleitem.message, linenumber=arguments.linenumber, category=local.ruleitem.category, severity=local.ruleitem.severity);
-					}
-				}
-				else if ( StructKeyExists(arguments,"line") AND NOT local.ruleitem.bulkcheck AND ListLen(local.ruleitem.tagname,"|") ) {
-					if ( REFindNoCase("<#Replace(local.ruleitem.tagname,'|','|<')#", arguments.line) ) {
-						local.codeCheckerReturn = variables.utilService._invoke(
-																		obj = local.ruleitem.componentname,
-																		fn = local.ruleitem.functionname,
-																		args = {
-																			line = arguments.line,
-																			passonmatch = local.ruleitem.passonmatch,
-																			pattern = local.ruleitem.pattern
-																		}
-																	);
-						if ( NOT local.codeCheckerReturn ) {
-							recordResult(directory=local.directory, file=local.file, rule=local.ruleitem.name, message=local.ruleitem.message, linenumber=arguments.linenumber, category=local.ruleitem.category, severity=local.ruleitem.severity);
-						}
-					}
-				}
-				else if ( NOT StructKeyExists(arguments,"line") AND local.ruleitem.bulkcheck ) {
-					local.objJREUtils = wirebox.getInstance( "jre-utils" );
-					local.dataFile = FileRead( arguments.filepath );
-					local.matches = local.objJREUtils.get( local.dataFile , local.ruleitem.pattern );
-					if ( ( local.ruleitem.passonmatch AND NOT ArrayLen(local.matches) ) OR ( ArrayLen(local.matches) AND NOT local.ruleitem.passonmatch ) ) {
-						// TODO: report actual line number
-						recordResult(directory=local.directory, file=local.file, rule=local.ruleitem.name, message=local.ruleitem.message, linenumber=-1, category=local.ruleitem.category, severity=local.ruleitem.severity);
-					}
-				}
-				else {
-					continue;
-				}
-			}
-		}
-	}
-
-	/**
-	* I run the qpscanner component.
-	* @filepath I am the file path for which to review.
-	*/
-	public void function runQueryParamScanner( required string filepath ) {
-		local.standardizedfilepath = Replace(arguments.filepath, "\", "/", "all");
-		local.file = ListLast(local.standardizedfilepath, "/");
-		local.directory = Replace(local.standardizedfilepath, local.file, "");
-		local.fileextension = ListLast(local.file, ".");
-		if ( ListFindNoCase("cfm,cfc",local.fileextension) ) {
-			
-			local.objJREUtils = wirebox.getInstance( "jre-utils" ).init();
-
-			local.objQueryParamScanner = wirebox.getInstance( 
-				name 			= "qpscanner",
-				initArguments 	= { 
-					jre  			= local.objJREUtils, 
-					StartingDir		= arguments.filepath, 
-					OutputFormat 	= "wddx", 
-					RequestTimeout 	= -1
-				}
-			);
-			local.qpScannerResult = local.objQueryParamScanner.go();
-			for ( local.row = 1; local.row LTE local.qpScannerResult.data.recordcount; local.row++ ) {
-				recordResult(directory=local.directory, file=local.file, rule="Missing cfqueryparam", message="All query variables should utilize cfqueryparam. This helps prevent sql injection. It also increases query performance by caching the execution plan.", linenumber=local.qpScannerResult.data.querystartline[local.row], category="QueryParamScanner", severity="5");
-			}
-		}
-	}
-
-	/**
-	* I run the varScoper component.
-	* @filepath I am the file path for which to review.
-	*/
-	public void function runVarScoper( required string filepath ) {
-		local.standardizedfilepath = Replace(arguments.filepath, "\", "/", "all");
-		local.file = ListLast(local.standardizedfilepath, "/");
-		local.directory = Replace(local.standardizedfilepath, local.file, "");
-		local.fileextension = ListLast(local.file, ".");
-		if ( local.fileextension IS "cfc" ) {
-			local.objVarScoper = wirebox.getInstance( name="varScoper", initArguments={ fileParseText=FileRead( arguments.filepath ) } );
-			local.objVarScoper.runVarscoper();
-			local.varScoperResult = local.objVarScoper.getResultsArray();
-			for ( local.resultitem in local.varScoperResult ) {
-				for ( local.unscopedstruct in local.resultitem.unscopedarray ) {
-					recordResult(directory=local.directory, file=local.file, rule="Unscoped CFC variable", message="All CFC variables should be scoped in order to prevent memory leaks.", linenumber=local.unscopedstruct.linenumber, category="VarScoper", severity="5");
-				}
-			}
-		}
-	}
-
-	/**
-	* I record the result of the code review.
-	*/
-	public void function recordResult() {
-		ArrayAppend(variables.results, arguments);
-	}
-
-}
diff --git a/models/QueryParamScanner/jre-utils.cfc b/models/QueryParamScanner/jre-utils.cfc
deleted file mode 100644
index 0fbfb76..0000000
--- a/models/QueryParamScanner/jre-utils.cfc
+++ /dev/null
@@ -1,192 +0,0 @@
-<cfcomponent output="false" displayname="jre-utils v0.6">
-
-
-	<cffunction name="init" output="false" access="public">
-		<cfargument name="DefaultFlags"        type="String"  default="MULTILINE"/>
-		<cfargument name="IgnoreInvalidFlags"  type="Boolean" default="false"/>
-		<cfargument name="BackslashReferences" type="Boolean" default="false"/>
-
-		<cfset var CurrentFlag = ""/>
-
-		<cfset This.Flags = Struct
-			( UNIX_LINES       : 1
-			, CASE_INSENSITIVE : 2
-			, COMMENTS         : 4
-			, MULTILINE        : 8
-			, DOTALL           : 32
-			, UNICODE_CASE     : 64
-			, CANON_EQ         : 128
-			)/>
-
-		<cfset This.DefaultFlags = This.parseFlags( Arguments.DefaultFlags , Arguments.IgnoreInvalidFlags )/>
-
-		<cfset This.BackslashReferences = Arguments.BackslashReferences/>
-
-		<!--- In CFMX we cannot define a "Replace" function directly. --->
-		<cfset This.replace   = _replace/>
-		<cfset StructDelete(This,'_replace')/>
-
-		<cfreturn This/>
-	</cffunction>
-
-
-
-	<cffunction name="Struct" returntype="Struct" access="private"><cfreturn Arguments/></cffunction>
-
-
-
-
-	<cffunction name="parseFlags" returntype="Numeric" output="false" access="public">
-		<cfargument name="FlagList"           type="String"/>
-		<cfargument name="IgnoreInvalidFlags" type="Boolean" default="false"/>
-		<cfset var CurrentFlag = ""/>
-		<cfset var ResultFlag = 0/>
-
-		<cfloop index="CurrentFlag" list="#Arguments.FlagList#">
-
-			<cfif isNumeric(CurrentFlag)>
-				<cfset ResultFlag = BitOr( ResultFlag , CurrentFlag )/>
-
-			<cfelseif StructKeyExists( This.Flags , CurrentFlag )>
-				<cfset ResultFlag = BitOr( ResultFlag , This.Flags[CurrentFlag] )/>
-
-			<cfelseif NOT Arguments.IgnoreInvalidFlags>
-				<cfthrow message="Invalid Flag!" detail="[#CurrentFlag#] is not supported."/>
-
-			</cfif>
-
-		</cfloop>
-
-		<cfreturn ResultFlag/>
-	</cffunction>
-
-
-
-	<cffunction name="matches" returntype="Boolean" output="false" access="public">
-		<cfargument name="Text"    type="String"/>
-		<cfargument name="Regex"   type="String"/>
-		<cfargument name="Flags"   default="#This.DefaultFlags#"/>
-
-		<cfset var Pattern = createObject("java","java.util.regex.Pattern")
-			.compile( Arguments.Regex , parseFlags(Arguments.Flags) )/>
-		<cfset var Matcher = Pattern.Matcher(Arguments.Text)/>
-
-		<cfloop condition="Matcher.find()">
-			<cfreturn True/>
-		</cfloop>
-
-		<cfreturn False/>
-	</cffunction>
-
-
-
-	<cffunction name="get" returntype="Array" output="false" access="public">
-		<cfargument name="Text"    type="String"/>
-		<cfargument name="Regex"   type="String"/>
-		<cfargument name="Flags"   default="#This.DefaultFlags#"/>
-
-		<cfset var Pattern = CreateObject("java","java.util.regex.Pattern")
-			.compile( Arguments.Regex , parseFlags(Arguments.Flags) )/>
-		<cfset var Matcher = Pattern.Matcher(Arguments.Text)/>
-		<cfset var Matches = ArrayNew(1)/>
-
-		<cfloop condition="Matcher.find()">
-			<cfset ArrayAppend(Matches,Matcher.Group())/>
-		</cfloop>
-
-		<cfreturn Matches/>
-	</cffunction>
-
-
-
-	<cffunction name="getNoCase" returntype="Array" output="false" access="public">
-		<cfargument name="Text"    type="String"/>
-		<cfargument name="Regex"   type="String"/>
-		<cfargument name="Flags"   default="#This.DefaultFlags#"/>
-
-		<cfreturn This.get
-			( Text  : Arguments.Text
-			, Regex : Arguments.Regex
-			, Flags : BitOr( Arguments.Flags , This.Flags.CASE_INSENSITIVE )
-			)/>
-	</cffunction>
-
-
-
-
-	<cffunction name="_replace" returntype="String" output="false" access="public">
-		<cfargument name="Text"        type="String"/>
-		<cfargument name="Regex"       type="String"/>
-		<cfargument name="Replacement" type="Any"    hint="String or UDF"/>
-		<cfargument name="Scope"       type="String" default="ONE" hint="ONE,ALL"/>
-
-		<cfset var String     = ""/>
-		<cfset var Pattern    = ""/>
-		<cfset var Matcher    = ""/>
-		<cfset var Results    = ""/>
-		<cfset var Groups     = ""/>
-		<cfset var GroupIndex = ""/>
-
-		<cfif isSimpleValue(Arguments.Replacement)>
-
-			<cfif This.BackslashReferences AND REfind('[\\$]',Arguments.Replacement)>
-				<cfset Arguments.Replacement = replace(Arguments.Replacement,'$',Chr(65536),'all')/>
-				<cfset Arguments.Replacement = REreplace(Arguments.Replacement,'\\(?=[0-9])','$','all')/>
-				<cfset Arguments.Replacement = replace(Arguments.Replacement,Chr(65536),'\$','all')/>
-			</cfif>
-
-			<cfset String = createObject("java","java.lang.String").init(Arguments.Text)/>
-			<cfif Arguments.Scope EQ "ALL">
-				<cfreturn String.replaceAll(Arguments.Regex,Arguments.Replacement)/>
-			<cfelse>
-				<cfreturn String.replaceFirst(Arguments.Regex,Arguments.Replacement)/>
-			</cfif>
-
-		<cfelse>
-
-			<cfset Pattern = createObject("java","java.util.regex.Pattern").compile(Arguments.Regex)/>
-			<cfset Matcher = Pattern.Matcher( Arguments.Text )/>
-			<cfset Results = createObject("java","java.lang.StringBuffer").init()/>
-
-			<cfloop condition="Matcher.find()">
-
-				<cfset Groups = ArrayNew(1)/>
-
-				<cfloop index="GroupIndex" from="1" to="#Matcher.GroupCount()#">
-					<cfset ArrayAppend( Groups , Matcher.Group( JavaCast("int",GroupIndex) ) )/>
-				</cfloop>
-
-				<cfset Matcher.appendReplacement
-					( Results , Arguments.Replacement( Matcher.Group() , Groups ) )/>
-
-				<cfif Arguments.Scope NEQ "ALL">
-					<cfbreak/>
-				</cfif>
-
-			</cfloop>
-
-			<cfset Matcher.appendTail(Results)/>
-
-			<cfreturn Results.toString()/>
-		</cfif>
-	</cffunction>
-
-
-
-	<cffunction name="escape" returntype="String" output="false" access="public">
-		<cfargument name="Text" type="String"/>
-		<cfset var Result = Arguments.Text/>
-		<cfset var Symbol = ""/>
-		<cfset var EscapeChars = "\,.,[,],(,),^,$,|,?,*,+,{,}"/>
-
-		<cfloop index="Symbol" list="#EscapeChars#">
-			<cfset Result = replace( Result , Symbol , '\'&Symbol , 'all')/>
-		</cfloop>
-
-		<cfreturn Result />
-	</cffunction>
-
-
-
-
-</cfcomponent>
\ No newline at end of file
diff --git a/models/QueryParamScanner/qpscanner.cfc b/models/QueryParamScanner/qpscanner.cfc
deleted file mode 100644
index d3f4db0..0000000
--- a/models/QueryParamScanner/qpscanner.cfc
+++ /dev/null
@@ -1,310 +0,0 @@
-<cfcomponent output="false" displayname="qpscanner v0.7">
-
-	<cffunction name="Struct" returntype="Struct" access="private"><cfreturn Arguments/></cffunction>
-
-	<cffunction name="init" returntype="any" output="false" access="public">
-		<cfargument name="jre"                   type="jre-utils"/>
-		<cfargument name="StartingDir"           type="String"                  hint="Directory to begin scanning the contents of."/>
-		<cfargument name="OutputFormat"          type="String"  default="html"  hint="Format of scan results: [html,wddx]"/>
-		<cfargument name="RequestTimeout"        type="Numeric" default="-1"    hint="Override Request Timeout, -1 to ignore"/>
-		<cfargument name="recurse"               type="Boolean" default="false" hint="Also scan sub-directories?"/>
-		<cfargument name="Exclusions"            type="String"  default=""      hint="Exclude files & directories matching this regex."/>
-		<cfargument name="scanOrderBy"           type="Boolean" default="true"  hint="Include ORDER BY statements in scan results?"/>
-		<cfargument name="scanQoQ"               type="Boolean" default="true"  hint="Include Query of Queries in scan results?"/>
-		<cfargument name="scanBuiltInFunc"       type="Boolean" default="true"  hint="Include Built-in Functions in scan results?"/>
-		<cfargument name="showScopeInfo"         type="Boolean" default="true"  hint="Show scope information in scan results?"/>
-		<cfargument name="highlightClientScopes" type="Boolean" default="true"  hint="Highlight scopes with greater risk?"/>
-		<cfargument name="ClientScopes"          type="String"  default="form,url,client,cookie" hint="Scopes considered client scopes."/>
-		<cfargument name="NumericFunctions"      type="String"  default="val,year,month,day,hour,minute,second,asc,dayofweek,dayofyear,daysinyear,quarter,week,fix,int,round,ceiling,gettickcount,len,min,max,pi,arraylen,listlen,structcount,listvaluecount,listvaluecountnocase,rand,randrange"/>
-		<cfargument name="BuiltInFunctions"      type="String"  default="now,#Arguments.NumericFunctions#"/>
-
-		<cfset var Arg = -1/>
-		<cfset var RegexList = ""/>
-		<cfset var Rex = ""/>
-		<cfset var cf = 'cf'/>
-
-		<cfloop item="Arg" collection="#Arguments#">
-			<cfset This[Arg] = Arguments[Arg]/>
-		</cfloop>
-
-		<cfset Variables.jre = Arguments.jre/>
-		<cfset StructDelete(This,'jre')/>
-
-		<cfset This.Totals = Struct
-			( AlertCount: 0
-			, QueryCount: 0
-			, FileCount : 0
-			, DirCount  : 0
-			, Time      : 0
-			)/>
-
-		<cfset This.Timeout = false/>
-
-		<cfset Variables.ResultFields = "FileId,FileName,QueryAlertCount,QueryTotalCount,QueryId,QueryName,QueryStartLine,QueryEndLine,ScopeList,ContainsClientScope,QueryCode"/>
-		<cfset Variables.AlertData = QueryNew(Variables.ResultFields)/>
-
-		<cfsavecontent variable="RegexList"><cfoutput>
-			findQueries      |(?si)(<#cf#query[^p]).*?(?=</#cf#query>)
-			findQueryTag     |(?si)(<#cf#query[^p][^>]{0,300}>)
-			isQueryOfQuery   |(?si)dbtype\s*=\s*["']query["']
-			killParams       |(?si)<#cf#queryparam[^>]+>
-			killCfTag        |(?si)<#cf#[a-z]{2,}[^>]*> <!--- Deliberately excludes Custom Tags and CFX --->
-			killOrderBy      |(?si)\bORDER BY\b.*?$
-			killBuiltIn      |(?si)##(#ListChangeDelims(This.BuiltInFunctions,'|')#)\([^)]*\)##
-			findScopes       |(?si)(?<=##([a-z]{1,20}\()?)[^\(##<]+?(?=\.[^##<]+?##)
-			findName         |(?si)(?<=(<#cf#query[^>]{0,300}\bname=")).*?(?="[^>]{0,300}>)
-			findClientScopes |(?i)\b(#ListChangeDelims(This.ClientScopes,'|')#)\b
-			isCfmlFile       |(?i)\.cf(c|ml?)$
-		</cfoutput></cfsavecontent>
-
-		<cfloop index="Rex" list="#RegexList#" delimiters="#Chr(10)#">
-			<cfif Len(Trim(Rex))>
-				<cfset Variables.Regexes[ Trim(ListFirst(Rex,'|')) ] = Trim(ListRest(Rex,'|'))/>
-			</cfif>
-		</cfloop>
-
-		<cfreturn This/>
-	</cffunction>
-
-
-
-	<cffunction name="go" returntype="any" output="false" access="public">
-		<cfset var StartTime = getTickCount()/>
-
-		<cfif This.RequestTimeout GT 0>
-			<cfsetting requesttimeout="#This.RequestTimeout#"/>
-		</cfif>
-
-		<cftry>
-			<cfset scan(This.StartingDir)/>
-
-			<!--- TODO: MINOR: CHECK: Is this the best way to handle this? --->
-			<!--- If timeout occurs, ignore error and proceed. --->
-			<cfcatch>
-				<cfif find('timeout',cfcatch.message)>
-					<cfset This.Timeout = True/>
-				<cfelse>
-					<cfrethrow/>
-				</cfif>
-			</cfcatch>
-		</cftry>
-
-		<cfset This.Totals.Time = getTickCount() - StartTime/>
-		<cfreturn Struct
-			( Data : Variables.AlertData
-			, Info : Struct
-				( Totals  : This.Totals
-				, Timeout : This.Timeout
-				)
-			)/>
-	</cffunction>
-
-
-
-	<cffunction name="scan" returntype="void" output="false" access="public">
-		<cfargument name="DirName"           type="string"/>
-		<cfset var qryDir     = -1/>
-		<cfset var qryCurData = -1/>
-		<cfset var CurrentTarget = -1/>
-		<cfset var process = true/>
-		<cfset var jre = Variables.jre/>
-
-		<cfif DirectoryExists(Arguments.DirName)>
-
-			<cfdirectory
-				name="qryDir"
-				directory="#Arguments.DirName#"
-				sort="type ASC,name ASC"
-			/>
-
-			<cfloop query="qryDir">
-
-				<cfset CurrentTarget = Arguments.DirName & '/' & Name />
-
-
-				<cfset process = true/>
-				<cfloop index="CurrentExclusion" list="#This.Exclusions#" delimiters=";">
-					<cfif jre.matches( CurrentTarget , CurrentExclusion )>
-						<cfset process = false/>
-					</cfif>
-				</cfloop>
-
-				<cfif process>
-
-					<cfif (Type EQ "dir") AND This.recurse >
-						<cfset This.Totals.DirCount = This.Totals.DirCount + 1 />
-
-						<cfset scan( CurrentTarget )/>
-
-					<cfelseif jre.matches( CurrentTarget , Variables.Regexes.isCfmlFile )>
-						<cfset This.Totals.FileCount = This.Totals.FileCount + 1 />
-
-						<cfset qryCurData = hunt( CurrentTarget )/>
-
-						<cfif qryCurData.RecordCount>
-							<cfset Variables.AlertData = QueryAppend( Variables.AlertData , qryCurData )/>
-						</cfif>
-
-					</cfif>
-
-				</cfif>
-			</cfloop>
-
-		<!--- This can only potentially trigger on first iteration, if This.StartingDir is a file. --->
-		<cfelseif FileExists(Arguments.DirName)>
-			<cfset This.Totals.FileCount = This.Totals.FileCount + 1 />
-
-			<cfset qryCurData = hunt( This.StartingDir )/>
-
-			<cfif qryCurData.RecordCount>
-				<cfset Variables.AlertData = QueryAppend( Variables.AlertData , qryCurData )/>
-			</cfif>
-		</cfif>
-
-	</cffunction>
-
-
-
-
-	<cffunction name="hunt" returntype="Query" output="false">
-		<cfargument name="FileName"    type="String"/>
-		<cfset var FileData        = -1/>
-		<cfset var Matches         = -1/>
-		<cfset var i               = -1/>
-		<cfset var info            = -1/>
-		<cfset var rekCode         = -1/>
-		<cfset var QueryCode       = -1/>
-		<cfset var CurRow          = -1/>
-		<cfset var CurFileId       = -1/>
-		<cfset var StartLine       = -1/>
-		<cfset var LineCount       = -1/>
-		<cfset var BeforeQueryCode = -1/>
-		<cfset var isRisk          = -1/>
-		<cfset var UniqueToken = Chr(65536)/>
-		<cfset var qryResult   = QueryNew(Variables.ResultFields)/>
-		<cfset var REX = Variables.Regexes/>
-		<cfset var jre = Variables.jre/>
-
-
-		<cffile action="read" file="#Arguments.FileName#" variable="FileData"/>
-
-		<cfset Matches = jre.get( FileData , REX.findQueries )/>
-		<cfset This.Totals.QueryCount = This.Totals.QueryCount + ArrayLen(Matches) />
-
-		<cfloop index="i" from="1" to="#ArrayLen(Matches)#">
-
-			<cfset QueryCode = jre.replace( Matches[i] , REX.findQueryTag , '' , 'ALL' )/>
-			<cfset rekCode = duplicate(QueryCode) />
-			<cfset rekCode = jre.replace( rekCode    , REX.killParams , '' , 'ALL' )/>
-			<cfset rekCode = jre.replace( rekCode    , REX.killCfTag  , '' , 'ALL' )/>
-
-			<cfif NOT This.scanOrderBy>
-				<cfset rekCode = jre.replace( rekCode , REX.killOrderBy , '' , 'ALL' )/>
-			</cfif>
-			<cfif NOT This.scanBuiltInFunc>
-				<cfset rekCode = jre.replace( rekCode , REX.killBuiltIn , '' , 'ALL' )/>
-			</cfif>
-
-			<cfset isRisk = find( '##' , rekCode )/>
-
-
-			<cfif (NOT This.scanQoQ) AND jre.matches( Matches[i] , REX.isQueryOfQuery )>
-				<cfset isRisk = false/>
-			</cfif>
-
-
-			<cfif isRisk>
-				<cfset CurRow = QueryAddRow(qryResult)/>
-
-				<cfset qryResult.QueryCode[CurRow] = jre.replace( QueryCode , Chr(13) , Chr(10) , 'all' ) />
-				<cfset qryResult.QueryCode[CurRow] = jre.replace( qryResult.QueryCode[CurRow] , Chr(10)&Chr(10) , Chr(10) , 'all' ) />
-				<cfif This.showScopeInfo >
-					<cfset qryResult.ScopeList[CurRow] = ArrayToList( ArrayUnique( jre.get( qryResult.QueryCode[CurRow] , REX.findScopes ) ) ) />
-
-					<cfset qryResult.ContainsClientScope[CurRow] = false/>
-					<cfif This.highlightClientScopes>
-						<cfloop index="CurrentScope" list="#This.ClientScopes#">
-							<cfif ListFind( qryResult.ScopeList[CurRow] , CurrentScope )>
-								<cfset qryResult.ContainsClientScope[CurRow] = true/>
-								<cfbreak/>
-							</cfif>
-						</cfloop>
-					</cfif>
-				</cfif>
-
-				<!--- CF8 doesn't support get()[1] so need to use two lines: --->
-				<cfset QueryTagCode = jre.get( Matches[i] , REX.findQueryTag )/>
-				<cfset QueryTagCode = QueryTagCode[1] />
-
-				<cfset BeforeQueryCode = ListFirst ( replace ( ' '&FileData&' ' , Matches[i] , UniqueToken ) , UniqueToken )/>
-
-
-				<cfset StartLine = 1+ArrayLen( jre.get( BeforeQueryCode , chr(10) ) )/>
-				<cfset LineCount = ArrayLen( jre.get( Matches[i] , chr(10) ) )/>
-
-
-				<cfset qryResult.QueryStartLine[CurRow] = StartLine/>
-				<cfset qryResult.QueryEndLine[CurRow]   = StartLine + LineCount />
-				<cfset qryResult.QueryName[CurRow]      = ArrayToList( jre.get( ListLast(QueryTagCode,chr(10)) , REX.findName ) )/>
-				<cfset qryResult.QueryId[CurRow]        = createUuid() />
-				<cfif NOT Len( qryResult.QueryName[CurRow] )>
-					<cfset qryResult.QueryName[CurRow] = "[unknown]"/>
-				</cfif>
-
-			</cfif>
-
-		</cfloop>
-
-		<cfset CurFileId = createUUID()/>
-		<cfloop query="qryResult">
-			<cfset qryResult.FileId[qryResult.CurrentRow]          = CurFileId />
-			<cfset qryResult.FileName[qryResult.CurrentRow]        = Arguments.FileName />
-			<cfset qryResult.QueryTotalCount[qryResult.CurrentRow] = ArrayLen(Matches) />
-			<cfset qryResult.QueryAlertCount[qryResult.CurrentRow] = qryResult.RecordCount />
-		</cfloop>
-		<cfset This.Totals.AlertCount = This.Totals.AlertCount + qryResult.RecordCount />
-
-		<cfreturn qryResult/>
-	</cffunction>
-
-
-
-
-
-
-
-
-	<cffunction name="ArrayUnique" returntype="Array" output="false" access="private">
-		<cfargument name="ArrayVar" type="Array"/>
-		<cfset var UniqueToken = Chr(65536)/>
-		<cfset var Result = duplicate(Arguments.ArrayVar)/>
-		<cfset ArraySort(Result,'text')/>
-		<cfset Result = ArrayToList( Result , UniqueToken )/>
-		<!--- TODO: MINOR: FIX: Using \b works for the ScopeList, but is not good enough for general use - why not using UniqueToken? --->
-		<cfset Result = REreplace( Result & UniqueToken , '(\b(.*?)\b)\1+' , '\1' , 'all' )/>
-		<cfset Result = ListToArray( Result , UniqueToken )/>
-		<!--- TODO: MINOR: Ideally, the original array order should be restored. --->
-		<cfreturn Result/>
-	</cffunction>
-
-
-
-	<cffunction name="QueryAppend" returntype="Query" output="false" access="private">
-		<cfargument name="QueryOne" type="Query"/>
-		<cfargument name="QueryTwo" type="Query"/>
-		<cfset var Result = -1/>
-		<!--- Bug fix for CF8 --->
-		<cfif NOT Arguments.QueryOne.RecordCount><cfreturn Arguments.QueryTwo /></cfif>
-		<cfif NOT Arguments.QueryTwo.RecordCount><cfreturn Arguments.QueryOne /></cfif>
-		<!--- / --->
-		<cfquery name="Result" dbtype="Query">
-			SELECT * FROM Arguments.QueryOne
-			UNION SELECT * FROM Arguments.QueryTwo
-		</cfquery>
-		<cfreturn Result/>
-	</cffunction>
-
-
-
-
-</cfcomponent>
\ No newline at end of file
diff --git a/models/QueryParamScanner/readme.txt b/models/QueryParamScanner/readme.txt
deleted file mode 100644
index 9b6a040..0000000
--- a/models/QueryParamScanner/readme.txt
+++ /dev/null
@@ -1,115 +0,0 @@
--------------------------------------------------------------------------------
-qpScanner v0.7
-
-
-
-INSTALLATION
-============
-	
-Extract all files to a directory in your webroot, then access in a browser.
-
-Everything required is contained within the zip file, and no mappings nor
-datasources need to be setup. 
-
-
-
-ECLIPSE PLUGIN INSTALLATION
-===========================
-
-There is an Eclipse plugin available for QueryParam Scanner.
-
-To install the plugin, please add the update site to Eclipse:
-
-	http://eclipse.hybridchill.com/
-
-Please consult the documentation that comes with the Plugin for further 
-details on the Plugin and how to use it.
-
-
-
-USAGE
-=====
-
-After launching QueryParam Scanner, you should see a Quick Start form:
-
-	Select Config
-		This allows you to choose between "default" or "paranoid" configs.
-		The default config should be fine for most people.
-
-	Starting Directory
-		Where you put the location of the project(s) you wish to scan.
-		This can be either an absolute path or a mapping.
-	
-	Recursive
-		Indicates if you want qpScanner to look inside directories, or remain 
-		at the current directory level. 
-
-
-Once these are set as appropriate, press Scan and qpScanner will get to work.
-
-As it finds queries with CF variables (ie: #values_in_hashes#) that are not 
-inside a <cfqueryparam/> tag, it will list that file. The positions of the
-queries are displayed when clicking on a file, and clicking on each of those
-reveals the actual contents of the query.
-
-When complete, it will list how many were found out of how many total queries.
-
-
-
-NOTE: QueryParam Scanner should be used *only* in your development environment, 
-not on a live/public box. In addition to the security risks, it might have an 
-adverse affect on performance.
-
-
-
-KNOWN ISSUES
-============
-
-This is a development release of QueryParam Scanner, and this list of issues
-may not be a complete one. Always ensure you have a recent backup of your code.
-
-There is one known issue with this version of qpScanner:
-
-1. Incorrect Line Numbers With Identical Queries
-If you have a file with multiple identical queries (same name/attributes/SQL),
-QueryParam Scanner will report line numbers correctly for only the first of 
-the queries.
-
-
-
-SUPPORT
-=======
-
-For help or support, please see the project page at Hybridchill:
-http://www.hybridchill.com/projects/qpscanner.html
-
-
-
-
-CREDITS
-=======
-
-QueryParam Scanner is a project created and maintained by Peter Boughton.
-
-It makes use of three other open-source projects:
-- Java Regex Utilities       http://www.hybridchill.com/projects/jre-utils.html
-- jQuery JavaScript library  http://www.jquery.com
-- Fusebox Framework          http://www.fuseboxframework.org
-
-
-
-
-LICENSING & VERSIONS
-====================
-
-GPL license (see included gpl-license.txt for details)
-- qpScanner v0.7.0
-- jre-utils v0.6.0
-- jQuery v1.2.6
-
-Apache 2 license (see fusebox5/LICENSE.txt for details)
-- Fusebox v5.5.1
-
-
-
--------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/models/QueryParamScanner/settings.cfc b/models/QueryParamScanner/settings.cfc
deleted file mode 100644
index 05129e5..0000000
--- a/models/QueryParamScanner/settings.cfc
+++ /dev/null
@@ -1,91 +0,0 @@
-<cfcomponent output="false">
-
-
-	<cffunction name="init" returntype="any" output="false" access="public">
-		<cfargument name="jre"             type="jre-utils"/>
-		<cfargument name="ConfigDirectory" type="String"/>
-
-		<cfset Variables.jre = Arguments.jre/>
-
-		<cfset This.ConfigDirectory = Arguments.ConfigDirectory/>
-
-		<cfreturn This/>
-	</cffunction>
-
-
-	<cffunction name="read" returntype="any" output="false" access="public">
-		<cfargument name="ConfigId" type="String"/>
-		<cfargument name="Format"   type="String" default="default" />
-		<cfset var Setting = QueryNew("id,label,type,options,value,hint")/>
-		<cfset var Sections = -1/>
-		<cfset var SectionList = -1/>
-		<cfset var CurSection = -1/>
-		<cfset var CurSetting = -1/>
-		<cfset var X = -1/>
-		<cfset var Result = -1/>
-		<cfset var RootConfigFile = This.ConfigDirectory&'/../config.ini' />
-		<cfset var ThisConfigFile = lcase( REreplace( Arguments.ConfigId , '\W+' , '' , 'all' ) ) />
-		<cfset ThisConfigFile = This.ConfigDirectory & '/#Arguments.ConfigId#.ini'/>
-
-		<cfif FileExists( ThisConfigFile )>
-
-			<cfset Sections = getProfileSections( RootConfigFile )/>
-			<cfset SectionList = getProfileString( RootConfigFile ,'Config' , 'keys' )/>
-
-			<cfloop index="CurSection" list="#SectionList#">
-				<cfset X = QueryAddRow(Setting)/>
-				<cfset Setting['Id'][X] = CurSection />
-				<cfloop index="CurSetting" list="#Sections[CurSection]#">
-					<cfset Setting[CurSetting][X] = getProfileString( RootConfigFile , CurSection , CurSetting )/>
-				</cfloop>
-			</cfloop>
-
-			<cfloop query="Setting">
-				<cfset Setting['Value'][CurrentRow] = getProfileString( ThisConfigFile , 'Settings' , Id )/>
-			</cfloop>
-
-
-			<cfswitch expression="#Arguments.Format#">
-				<cfcase value="Struct">
-					<cfset Result = StructNew()/>
-					<cfloop query="Setting">
-						<cfset Result[Id] = Value />
-					</cfloop>
-					<cfreturn Result/>
-				</cfcase>
-				<cfdefaultcase>
-					<cfreturn Setting/>
-				</cfdefaultcase>
-			</cfswitch>
-		<cfelse>
-			<cfthrow
-				message="Invalid Value '#Arguments.ConfigId#' for Argument ConfigId."
-				detail="Cannot find configuration file at '#ConfigFile#'."
-				type="qpscanner.Settings.Read.InvalidArgument.ConfigId"
-			/>
-		</cfif>
-	</cffunction>
-
-
-
-	<cffunction name="findHomeDirectory" returntype="String" output="false">
-		<cfset var Result = ""/>
-		<cfset var CurDir = -1/>
-		<cfset var DirList = "{home-directory},/,."/>
-		<cfset var jre = Variables.jre/>
-
-		<cfloop index="CurDir" list="#DirList#">
-			<cfif DirectoryExists( expandPath(CurDir) )>
-				<cfset Result = expandPath( CurDir )/>
-				<cfbreak/>
-			</cfif>
-		</cfloop>
-
-		<cfset Result = jre.replace( Result , '[\\/]+' , '/' , 'all' )/>
-		<cfset Result = jre.replace( Result , '(<!(:))/$' , '' )/>
-
-		<cfreturn Result/>
-	</cffunction>
-
-
-</cfcomponent>
\ No newline at end of file
diff --git a/models/RulesService.cfc b/models/RulesService.cfc
deleted file mode 100644
index d7e1c5d..0000000
--- a/models/RulesService.cfc
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
-* I set the rules for the code checker.
-*/
-component accessors="true" singleton{
-
-	property name="categories" 	type="array";
-	property name="rules" 		type="array";
-
-	/**
-	* @hint I initialize the component.
-	* @rulesDirPath I am the directory path containing the rules.
-	*/
-	RulesService function init( string rulesDirPath = expandPath( '/codechecker/config/rules' ) ){
-
-		variables.categories 	= [];
-		variables.rules 		= [];
-
-		//TODO: support cfscript patterns
-		//TODO: support multiline
-		//TODO: unscoped variables in cfm pages
-		//TODO: unnecessary use of pound signs
-		//TODO: reserved words/functions
-		//TODO: deprecated functions
-		//TODO: require return statement for return types other than void
-
-		// path, recurse, listInfo, filter, sort
-		local.rulesFilePaths = directoryList(
-			arguments.rulesDirPath,
-			true,
-			"path",
-			"*.json",
-			"asc"
-		);
-
-		for ( local.ruleFile in local.rulesFilePaths ) {
-			// merge array of config data
-			if ( findNoCase( 'disabled',local.ruleFile ) == 0 ) {
-				variables.rules.addAll( deserializeJSON( fileRead( local.ruleFile ) ) );
-			}
-			
-		}
-
-		for( local.rule in variables.rules ) {
-			if ( findNoCase( 'disabled',local.ruleFile ) == 0 ) {
-				if ( NOT arrayFind( variables.categories, local.rule.category ) ) {
-					arrayAppend( variables.categories, local.rule.category);
-				}
-			}	
-		}
-
-		return this;
-	}
-
-}
diff --git a/models/SpreadSheet/Spreadsheet.cfc b/models/SpreadSheet/Spreadsheet.cfc
deleted file mode 100644
index 40a7787..0000000
--- a/models/SpreadSheet/Spreadsheet.cfc
+++ /dev/null
@@ -1,1159 +0,0 @@
-component{
-
-	variables.version = "0.4.8";
-	variables.poiLoaderName = "_poiLoader-" & Hash( GetCurrentTemplatePath() );
-
-	variables.dateFormats = {
-		DATE 				= "yyyy-mm-dd"
-		,DATETIME		=	"yyyy-mm-dd HH:nn:ss"
-		,TIME 			= "hh:mm:ss"
-		,TIMESTAMP 	= "yyyy-mm-dd hh:mm:ss"
-	};
-	variables.exceptionType	=	"cfsimplicity.lucee.spreadsheet";
-
-	include "tools.cfm";
-	include "formatting.cfm";
-
-	function init( struct dateFormats ){
-		if( arguments.KeyExists( "dateFormats" ) )
-			this.overrideDefaultDateFormats( arguments.dateFormats );
-		return this;
-	}
-
-	private void function overrideDefaultDateFormats( required struct formats ){
-		for( var format in formats ){
-			if( !variables.dateFormats.KeyExists( format ) )
-				throw( type=exceptionType,message="Invalid date format key",detail="'#format#' is not a valid dateformat key. Valid keys are DATE, DATETIME, TIME and TIMESTAMP" );
-			variables.dateFormats[ format ]=formats[ format ];
-		}
-	}
-
-	void function flushPoiLoader(){
-		lock scope="server" timeout="10"{
-			StructDelete( server,poiLoaderName );
-		};
-	}
-
-	/* META INFO */
-	public struct function getDateFormats(){
-		return dateFormats;
-	}
-
-	/* CUSTOM METHODS */
-
-	any function workbookFromQuery( required query data,boolean addHeaderRow=true,boldHeaderRow=true,xmlFormat=false ){
-		var workbook = this.new( xmlFormat=xmlFormat );
-		if( addHeaderRow ){
-			var columns	=	QueryColumnArray( data );
-			this.addRow( workbook,columns.ToList() );
-			if( boldHeaderRow )
-				this.formatRow( workbook,{ bold=true },1 );
-			this.addRows( workbook,data,2,1 );
-		} else {
-			this.addRows( workbook,data );
-		}
-		return workbook;
-	}
-
-	binary function binaryFromQuery( required query data,boolean addHeaderRow=true,boldHeaderRow=true,xmlFormat=false ){
-		/* Pass in a query and get a spreadsheet binary file ready to stream to the browser */
-		var workbook = this.workbookFromQuery( argumentCollection=arguments );
-		return this.readBinary( workbook );
-	}
-
-	void function downloadFileFromQuery(
-		required query data
-		,required string filename
-		,boolean addHeaderRow=true
-		,boolean boldHeaderRow=true
-		,boolean xmlFormat=false
-		,string contentType
-	){
-		var safeFilename	=	this.filenameSafe( filename );
-		var filenameWithoutExtension = safeFilename.REReplace( "\.xlsx?$","" );
-		var binary = this.binaryFromQuery( data,addHeaderRow,boldHeaderRow,xmlFormat );
-		if( !arguments.KeyExists( "contentType" ) )
-			arguments.contentType = xmlFormat? "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": "application/msexcel";
-		var extension = xmlFormat? "xlsx": "xls";
-		header name="Content-Disposition" value="attachment; filename=#Chr(34)##filenameWithoutExtension#.#extension##Chr(34)#";
-		content type=contentType variable="#binary#" reset="true";
-	}
-
-	void function downloadCsvFromFile(
-		required string src
-		,required string filename
-		,string contentType="text/csv"
-		,string columns
-		,string columnNames
-		,numeric headerRow
-		,string rows
-		,string sheetName
-		,numeric sheetNumber // 1-based
-		,boolean includeHeaderRow=false
-		,boolean includeBlankRows=false
-		,boolean fillMergedCellsWithVisibleValue=false
-	){
-		arguments.format="csv";
-		var csv=this.read( argumentCollection=arguments );
-		var binary=ToBinary( ToBase64( csv.Trim() ) );
-		var safeFilename	=	this.filenameSafe( filename );
-		var filenameWithoutExtension = safeFilename.REReplace( "\.csv$","" );
-		header name="Content-Disposition" value="attachment; filename=#Chr(34)##filenameWithoutExtension#.csv#Chr(34)#";
-		content type=contentType variable="#binary#" reset="true";
-	}
-
-	void function writeFileFromQuery(
-		required query data
-		,required string filepath
-		,boolean overwrite=false
-		,boolean addHeaderRow=true
-		,boldHeaderRow=true
-		,xmlFormat=false
-	){
-		if( !xmlFormat AND ( ListLast( filepath,"." ) IS "xlsx" ) )
-			arguments.xmlFormat=true;
-		var workbook = this.workbookFromQuery( data,addHeaderRow,boldHeaderRow,xmlFormat );
-		if( xmlFormat AND ( ListLast( filepath,"." ) IS "xls" ) )
-			arguments.filePath &="x";// force to .xlsx
-		this.write( workbook=workbook,filepath=filepath,overwrite=overwrite );
-	}
-
-	/* MAIN API */
-
-	void function addColumn(
-		required workbook
-		,required string data /* Delimited list of cell values */
-		,numeric startRow
-		,numeric startColumn
-		,boolean insert=true
-		,string delimiter=","
-		,boolean autoSize=false
-	){
-		var row 				= 0;
-		var cell 				= 0;
-		var oldCell 		= 0;
-		var rowNum 			= ( arguments.KeyExists( "startRow" ) AND startRow )? startRow-1: 0;
-		var cellNum 		= 0;
-		var lastCellNum = 0;
-		var cellValue 	= 0;
-		if( arguments.KeyExists( "startColumn" ) ){
-			cellNum = startColumn-1;
-		} else {
-			row = this.getActiveSheet( workbook ).getRow( rowNum );
-			/* if this row exists, find the next empty cell number. note: getLastCellNum() returns the cell index PLUS ONE or -1 if not found */
-			if( !IsNull( row ) AND row.getLastCellNum() GT 0 )
-				cellNum = row.getLastCellNum();
-			else
-				cellNum = 0;
-		}
-		var columnNumber = cellNum+1;
-		var columnData = ListToArray( data,delimiter );
-		for( var cellValue in columnData ){
-			/* if rowNum is greater than the last row of the sheet, need to create a new row  */
-			if( rowNum GT this.getActiveSheet( workbook ).getLastRowNum() OR IsNull( this.getActiveSheet( workbook ).getRow( rowNum ) ) )
-				row = this.createRow( workbook,rowNum );
-			else
-				row = this.getActiveSheet( workbook ).getRow( rowNum );
-			/* POI doesn't have any 'shift column' functionality akin to shiftRows() so inserts get interesting */
-			/* ** Note: row.getLastCellNum() returns the cell index PLUS ONE or -1 if not found */
-			if( insert AND ( cellNum LT row.getLastCellNum() ) ){
-				/*  need to get the last populated column number in the row, figure out which cells are impacted, and shift the impacted cells to the right to make room for the new data */
-				lastCellNum = row.getLastCellNum();
-				for( var i=lastCellNum; i EQ cellNum; i-- ){
-					oldCell	=	row.getCell( JavaCast( "int",i-1 ) );
-					if( !IsNull( oldCell ) ){
-						cell = this.createCell( row,i );
-						cell.setCellStyle( oldCell.getCellStyle() );
-						var cellValue = this.getCellValueAsType( workbook,oldCell );
-						this.setCellValueAsType( workbook,oldCell,cellValue );
-						cell.setCellComment( oldCell.getCellComment() );
-					}
-				}
-			}
-			cell = this.createCell( row,cellNum );
-			this.setCellValueAsType( workbook,cell,cellValue );
-			rowNum++;
-		}
-		if( autoSize )
-			this.autoSizeColumn( workbook,columnNumber );
-	}
-
-	void function addFreezePane(
-		required workbook
-		,required numeric freezeColumn
-		,required numeric freezeRow
-		,numeric leftmostColumn //left column visible in right pane
-		,numeric topRow //top row visible in bottom pane
-	){
-		if( arguments.KeyExists( "leftmostColumn" ) AND !arguments.KeyExists( "topRow" ) )
-			arguments.topRow = freezeRow;
-		if( arguments.KeyExists( "topRow" ) AND !arguments.KeyExists( "leftmostColumn" ) )
-			arguments.leftmostColumn = freezeColumn;
-		/* createFreezePane() operates on the logical row/column numbers as opposed to physical, so no need for n-1 stuff here */
-		if( !arguments.KeyExists( "leftmostColumn" ) ){
-			this.getActiveSheet( workbook ).createFreezePane( JavaCast( "int",freezeColumn ),JavaCast( "int",freezeRow ) );
-			return;
-		}
-		// POI lets you specify an active pane if you use createSplitPane() here
-		this.getActiveSheet( workbook ).createFreezePane(
-			JavaCast( "int",freezeColumn )
-			,JavaCast( "int",freezeRow )
-			,JavaCast( "int",leftmostColumn )
-			,JavaCast( "int",topRow )
-		);
-	}
-
-	void function addImage(
-		required workbook
-		,string filepath
-		,imageData
-		,string imageType
-		,required string anchor
-	){
-		/* 
-			TODO: Should we allow for passing in of a boolean indicating whether or not an image resize should happen (only works on jpg and png)? Currently does not resize. If resize is performed, it does mess up passing in x/y coordinates for image positioning.
-		 */
-		if( !arguments.KeyExists( "filepath" ) AND !arguments.KeyExists( "imageData" ) )
-			throw( type=exceptionType,message="Invalid argument combination",detail="You must provide either a file path or an image object" );
-		if( arguments.KeyExists( "imageData" ) AND !arguments.KeyExists( "imageType" ) )
-			throw( type=exceptionType,message="Invalid argument combination",detail="If you specify an image object, you must also provide the imageType argument" );
-		var numberOfAnchorElements = ListLen( anchor );
-		if( ( numberOfAnchorElements NEQ 4 ) AND ( numberOfAnchorElements NEQ 8 ) )
-			throw( type=exceptionType,message="Invalid anchor argument",detail="The anchor argument must be a comma-delimited list of integers with either 4 or 8 elements" );
-		//we'll need the image type int in all cases
-		if( arguments.KeyExists( "filepath" ) ){
-			if( !FileExists( filepath ) )
-				throw( type=exceptionType,message="Non-existent file",detail="The specified file does not exist." );
-			try{
-				arguments.imageType = ListLast( FileGetMimeType( filepath ),"/" );
-			}
-			catch( any exception ){
-				throw( type=exceptionType,message="Could Not Determine Image Type",detail="An image type could not be determined from the filepath provided" );
-			}
-		} else if( !arguments.KeyExists( "imageType" ) ){
-			throw( type=exceptionType,message="Could Not Determine Image Type",detail="An image type could not be determined from the filepath or imagetype provided" );
-		}
-		arguments.imageType	=	imageType.UCase();
-		switch( imageType ){
-			case "DIB": case "EMF": case "JPEG": case "PICT": case "PNG": case "WMF":
-				var imageTypeIndex = workbook[ "PICTURE_TYPE_" & imageType ];
-			break;
-			case "JPG":
-				var imageTypeIndex = workbook.PICTURE_TYPE_JPEG;
-			break;
-			default:
-				throw( type=exceptionType,message="Invalid Image Type",detail="Valid image types are DIB, EMF, JPG, JPEG, PICT, PNG, and WMF" );
-		}
-		if( arguments.KeyExists( "filepath" ) ){
-			try{
-				var inputStream = CreateObject( "java","java.io.FileInputStream" ).init( JavaCast("string",filepath ) );
-				var ioUtils = this.loadPoi( "org.apache.poi.util.IOUtils" );
-				var bytes = ioUtils.toByteArray( inputStream );
-			}
-			finally{
-				inputStream.close();
-			}
-		} else {
-			var bytes = ToBinary( imageData );
-		}
-		var imageIndex = workbook.addPicture( bytes,JavaCast( "int",imageTypeIndex ) );
-		var theAnchor = this.loadPoi( "org.apache.poi.hssf.usermodel.HSSFClientAnchor" ).init();
-		if( numberOfAnchorElements EQ 4 ){
-			theAnchor.setRow1( JavaCast( "int",ListFirst( anchor )-1 ) );
-			theAnchor.setCol1( JavaCast( "int",ListGetAt( anchor, 2 )-1 ) );
-			theAnchor.setRow2( JavaCast( "int",ListGetAt( anchor, 3 )-1 ) );
-			theAnchor.setCol2( JavaCast( "int",ListLast( anchor )-1 ) );
-		} else if( numberOfAnchorElements EQ 8 ){
-			theAnchor.setDx1( JavaCast( "int",ListFirst( anchor ) ) );
-			theAnchor.setDy1( JavaCast( "int",ListGetAt( anchor,2 ) ) );
-			theAnchor.setDx2( JavaCast( "int",ListGetAt( anchor,3 ) ) );
-			theAnchor.setDy2( JavaCast( "int",ListGetAt( anchor,4 ) ) );
-			theAnchor.setRow1( JavaCast( "int",ListGetAt( anchor,5 )-1 ) );
-			theAnchor.setCol1( JavaCast( "int",ListGetAt( anchor,6 )-1 ) );
-			theAnchor.setRow2( JavaCast( "int",ListGetAt( anchor,7 )-1 ) );
-			theAnchor.setCol2( JavaCast( "int",ListLast( anchor )-1 ) );
-		}
-		/* TODO: need to look into createDrawingPatriarch() vs. getDrawingPatriarch() since create will kill any existing images. getDrawingPatriarch() throws  a null pointer exception when an attempt is made to add a second image to the spreadsheet  */
-		var drawingPatriarch = getActiveSheet( workbook ).createDrawingPatriarch();
-		var picture = drawingPatriarch.createPicture( theAnchor,imageIndex );
-		/* Disabling this for now--maybe let people pass in a boolean indicating whether or not they want the image resized?
-		 if this is a png or jpg, resize the picture to its original size (this doesn't work for formats other than jpg and png)
-			<cfif imgTypeIndex eq getWorkbook().PICTURE_TYPE_JPEG or imgTypeIndex eq getWorkbook().PICTURE_TYPE_PNG>
-				<cfset picture.resize() />
-			</cfif>
-		*/
-	}
-
-	void function addInfo( required workbook,required struct info ){
-		/* Valid struct keys are author, category, lastauthor, comments, keywords, manager, company, subject, title */
-		if( this.isBinaryFormat( workbook ) )
-			this.addInfoBinary( workbook,info );
-		else
-			this.addInfoXml( workbook,info );
-	}
-
-	void function addRow(
-		required workbook
-		,required string data /* Delimited list of data */
-		,numeric row
-		,numeric column=1
-		,boolean insert=true
-		,string delimiter=","
-		,boolean handleEmbeddedCommas=true /* When true, values enclosed in single quotes are treated as a single element like in ACF. Only applies when the delimiter is a comma. */
-		,boolean autoSizeColumns=false
-	){
-		if( arguments.KeyExists( "row" ) AND ( row LTE 0 ) )
-			throw( type=exceptionType,message="Invalid row value",detail="The value for row must be greater than or equal to 1." );
-		if( arguments.KeyExists( "column" ) AND ( column LTE 0 ) )
-			throw( type=exceptionType,message="Invalid column value",detail="The value for column must be greater than or equal to 1." );
-		if( !insert AND !arguments.KeyExists( "row") )
-			throw( type=exceptionType,message="Missing row value",detail="To replace a row using 'insert', please specify the row to replace." );
-		var lastRow = this.getNextEmptyRow( workbook );
-		//If the requested row already exists...
-		if( arguments.KeyExists( "row" ) AND ( row LTE lastRow ) ){
-			if( arguments.insert )
-				shiftRows( workbook,row,lastRow,1 );//shift the existing rows down (by one row)
-			else
-				deleteRow( workbook,row );//otherwise, clear the entire row
-		}
-		var theRow = arguments.KeyExists( "row" )? this.createRow( workbook,arguments.row-1 ): this.createRow( workbook );
-		var rowValues = this.parseRowData( data,delimiter,handleEmbeddedCommas );
-		var cellIndex = column-1;
-		for( var cellValue in rowValues ){
-			var cell = this.createCell( theRow,cellIndex );
-			this.setCellValueAsType( workbook,cell,cellValue.Trim() )
-			if( autoSizeColumns )
-				this.autoSizeColumn( workbook,column );
-			cellIndex++;
-		}
-	}
-
-	void function addRows(
-		required workbook
-		,required query data
-		,numeric row
-		,numeric column=1
-		,boolean insert=true
-		,boolean autoSizeColumns=false
-	){
-		var lastRow = this.getNextEmptyRow( workbook );
-		if( arguments.KeyExists( "row" ) AND ( row LTE lastRow ) AND insert )
-			shiftRows( workbook,row,lastRow,data.recordCount );
-		var rowNum	=	arguments.keyExists( "row" )? row-1: this.getNextEmptyRow( workbook );
-		var queryColumns = this.getQueryColumnFormats( workbook,data );
-		var dateUtil = this.getDateUtil();
-		for( var dataRow in data ){
-			var newRow = this.createRow( workbook,rowNum,false );
-			var cellIndex = ( column-1 );
-			/* Note: To properly apply date/number formatting:
- 				- cell type must be CELL_TYPE_NUMERIC
- 				- cell value must be applied as a java.util.Date or java.lang.Double (NOT as a string)
- 				- cell style must have a dataFormat (datetime values only)
-   		*/
-   		/* populate all columns in the row */
-   		for( var queryColumn in queryColumns ){
-   			var cell 	= this.createCell( newRow, cellIndex, false );
-				var value = dataRow[ queryColumn.name ];
-				var forceDefaultStyle = false;
-				queryColumn.index = cellIndex;
-				/* Cast the values to the correct type, so data formatting is properly applied  */
-				if( queryColumn.cellDataType IS "DOUBLE" AND IsNumeric( value ) ){
-					cell.setCellValue( JavaCast( "double",Val( value ) ) );
-				} else if( queryColumn.cellDataType IS "TIME" AND IsDate( value ) ){
-					value = TimeFormat( ParseDateTime( value ),"HH:MM:SS");				
-					cell.setCellValue( dateUtil.convertTime( value ) );
-					forceDefaultStyle = true;
-				} else if( queryColumn.cellDataType EQ "DATE" AND IsDate( value ) ){
-					/* If the cell is NOT already formatted for dates, apply the default format brand new cells have a styleIndex == 0  */
-					var styleIndex = cell.getCellStyle().getDataFormat();
-					var styleFormat = cell.getCellStyle().getDataFormatString();
-					if( styleIndex EQ 0 OR NOT dateUtil.isADateFormat( styleIndex,styleFormat ) )
-						forceDefaultStyle = true;
-					cell.setCellValue( ParseDateTime( value ) );
-				} else if( queryColumn.cellDataType EQ "BOOLEAN" AND IsBoolean( value ) ){
-					cell.setCellValue( JavaCast( "boolean",value ) );
-				} else if( IsSimpleValue( value ) AND !Len( value ) ){ //NB don't use member function: won't work if numeric
-					cell.setCellType( cell.CELL_TYPE_BLANK );
-				} else {
-					cell.setCellValue( JavaCast( "string",value ) );
-				}
-				/* Replace the existing styles with custom formatting  */
-				if( queryColumn.KeyExists( "customCellStyle" ) ){
-					cell.setCellStyle( queryColumn.customCellStyle );
-					/* Replace the existing styles with default formatting (for readability). The reason we cannot just update the cell's style is because they are shared. So modifying it may impact more than just this one cell. */
-				} else if( queryColumn.KeyExists( "defaultCellStyle" ) AND forceDefaultStyle ){
-					cell.setCellStyle( queryColumn.defaultCellStyle );
-				}
-				cellIndex++;
-   		}
-   		rowNum++;
-		}
-		if( autoSizeColumns ){
-			var numberOfColumns = queryColumns.Len();
-			var thisColumn = column;
-			for( var i=thisColumn; i LTE numberOfColumns; i++ ){
-				this.autoSizeColumn( workbook,thisColumn );
-				thisColumn++;
-			}
-		}
-	}
-
-	void function addSplitPane(
-		required workbook
-		,required numeric xSplitPosition
-		,required numeric ySplitPosition
-		,required numeric leftmostColumn
-		,required numeric topRow
-		,string activePane="UPPER_LEFT" //Valid values are LOWER_LEFT, LOWER_RIGHT, UPPER_LEFT, and UPPER_RIGHT
-	){
-		var activeSheet = this.getActiveSheet( workbook );
-		arguments.activePane = activeSheet[ "PANE_#activePane#" ];
-		activeSheet.createSplitPane(
-			JavaCast( "int",xSplitPosition )
-			,JavaCast( "int",ySplitPosition )
-			,JavaCast( "int",leftmostColumn )
-			,JavaCast( "int",topRow )
-			,JavaCast( "int",activePane )
-		);
-	}
-
-	void function autoSizeColumn( required workbook,required numeric column,boolean useMergedCells=false ){
-		if( column LTE 0 )
-			throw( type=exceptionType,message="Invalid column value",detail="The value for column must be greater than or equal to 1." );
-		/* Adjusts the width of the specified column to fit the contents. For performance reasons, this should normally be called only once per column. */
-		var columnIndex = column-1;
-		this.getActiveSheet( workbook ).autoSizeColumn( columnIndex,useMergedCells );
-	}
-
-	void function clearCell( required workbook,required numeric row,required numeric column ){
-		/* Clears the specified cell of all styles and values */
-		var defaultStyle  = workbook.getCellStyleAt( JavaCast( "short",0 ) );
-		var rowIndex = row-1;
-		var rowObject = this.getActiveSheet( workbook ).getRow( JavaCast( "int",rowIndex ) );
-		if( IsNull( rowObject ) )
-			return;
-		var columnIndex = column-1;
-		var cell = rowObject.getCell( JavaCast( "int",columnIndex ) );
-		if( IsNull( cell ) )
-			return;
-		cell.setCellStyle( defaultStyle );
-		cell.setCellType( cell.CELL_TYPE_BLANK );
-	}
-	
-	void function clearCellRange(
-		required workbook
-		,required numeric startRow
-		,required numeric startColumn
-		,required numeric endRow
-		,required numeric endColumn
-	){
-		/* Clears the specified cell range of all styles and values */
-		for( var rowNumber=startRow; rowNumber LTE endRow; rowNumber++ ){
-			for( var columnNumber=startColumn; columnNumber LTE endColumn; columnNumber++ ){
-				clearCell( workbook,rowNumber,columnNumber );
-			}
-		}
-	}
-
-	void function createSheet( required workbook,string sheetName,overwrite=false ){
-		if( arguments.KeyExists( "sheetName" ) )
-			this.validateSheetName( sheetName );
-		else
-			arguments.sheetName = this.generateUniqueSheetName( workbook );
-		if( !this.sheetExists( workbook=workbook,sheetName=sheetName ) ){
-			workbook.createSheet( JavaCast( "String",sheetName ) );
-			return;
-		}
-		/* sheet already exists with that name */
-		if( !overwrite )
-			throw( type=exceptionType,message="Sheet name already exists",detail="A sheet with the name '#sheetName#' already exists in this workbook" );
-		/* OK to replace the existing */
-		var sheetIndexToReplace = workbook.getSheetIndex( JavaCast( "string",sheetName) );
-		this.deleteSheetAtIndex( workbook,sheetIndexToReplace );
-		var newSheet = workbook.createSheet( JavaCast( "String",sheetName ) );
-		var moveToIndex = sheetIndexToReplace;
-		this.moveSheet( workbook,sheetName,moveToIndex );
-	}
-
-	void function deleteColumn( required workbook,required numeric column ){
-		if( column LTE 0 )
-			throw( type=exceptionType,message="Invalid column value",detail="The value for column must be greater than or equal to 1." );
-			/* POI doesn't have remove column functionality, so iterate over all the rows and remove the column indicated */
-		var rowIterator = this.getActiveSheet( workbook ).rowIterator();
-		while( rowIterator.hasNext() ){
-			var row = rowIterator.next();
-			var cell = row.getCell( JavaCast( "int",column-1 ) );
-			if( IsNull( cell ) )
-				continue;
-			row.removeCell( cell );
-		}
-	}
-
-	void function deleteColumns( required workbook,required string range ){
-		/* Validate and extract the ranges. Range is a comma-delimited list of ranges, and each value can be either a single number or a range of numbers with a hyphen. */
-		var allRanges = this.extractRanges( range );
-		for( var thisRange in allRanges ){
-			if( thisRange.startAt EQ thisRange.endAt ){
-				/* Just one row */
-				this.deleteColumn( workbook,thisRange.startAt );
-				continue;
-			}
-			for( var columnNumber=thisRange.startAt; columnNumber LTE thisRange.endAt; columnNumber++ ){
-				this.deleteColumn( workbook,columnNumber );
-			}
-		}
-	}
-
-	void function deleteRow( required workbook,required numeric row ){
-		/* Deletes the data from a row. Does not physically delete the row. */
-		if( row LTE 0 )
-			throw( type=exceptionType,message="Invalid row value",detail="The value for row must be greater than or equal to 1." );
-		var rowToDelete = row-1;
-		if( rowToDelete GTE this.getFirstRowNum( workbook ) AND rowToDelete LTE this.getLastRowNum( workbook ) ) //If this is a valid row, remove it
-			this.getActiveSheet( workbook ).removeRow( this.getActiveSheet( workbook ).getRow( JavaCast( "int",rowToDelete ) ) );
-	}
-
-	void function deleteRows( required workbook,required string range ){
-		/* Validate and extract the ranges. Range is a comma-delimited list of ranges, and each value can be either a single number or a range of numbers with a hyphen. */
-		var allRanges = this.extractRanges( range );
-		for( var thisRange in allRanges ){
-			if( thisRange.startAt EQ thisRange.endAt ){
-				/* Just one row */
-				this.deleteRow( workbook,thisRange.startAt );
-				continue;
-			}
-			for( var rowNumber=thisRange.startAt; rowNumber LTE thisRange.endAt; rowNumber++ ){
-				this.deleteRow( workbook,rowNumber );
-			}
-		}
-	}
-
-	void function formatCell( required workbook,required struct format,required numeric row,required numeric column,any cellStyle ){
-		var cell = this.initializeCell( workbook,row,column );
-		if( arguments.KeyExists( "cellStyle" ) )
-			cell.setCellStyle( cellStyle );// reuse an existing style
-		else
-			cell.setCellStyle( this.buildCellStyle( workbook,format ) );
-	}
-
-	void function formatCellRange(
-		required workbook
-		,required struct format
-		,required numeric startRow
-		,required numeric endRow
-		,required numeric startColumn
-		,required numeric endColumn
-		){
-		var style = this.buildCellStyle( workbook,format );
-		for( var rowNumber=startRow; rowNumber LTE endRow; rowNumber++ ){
-			for( var columnNumber=startColumn; columnNumber LTE endColumn; columnNumber++ ){
-				this.formatCell( workbook,format,rowNumber,columnNumber,style );
-			}
-		}
-	}
-
-	void function formatColumn( required workbook,required struct format,required numeric column ){
-		if( column LT 1 )
-			throw( type=exceptionType,message="Invalid column value",detail="The column value must be greater than 0" );
-		var rowIterator = this.getActiveSheet( workbook ).rowIterator();
-		var columnNumber = column;
-		while( rowIterator.hasNext() ){
-			var rowNumber = rowIterator.next().getRowNum() + 1;
-			this.formatCell( workbook,format,rowNumber,columnNumber );
-		}
-	}
-
-	void function formatColumns( required workbook,required struct format,required string range ){
-		/* Validate and extract the ranges. Range is a comma-delimited list of ranges, and each value can be either a single number or a range of numbers with a hyphen. */
-		var allRanges = this.extractRanges( range );
-		for( var thisRange in allRanges ){
-			if( thisRange.startAt EQ thisRange.endAt ){
-				/* Just one column */
-				this.formatColumn( workbook,format,thisRange.startAt );
-				continue;
-			}
-			for( var columnNumber=thisRange.startAt; columnNumber LTE thisRange.endAt; columnNumber++ ){
-				this.formatColumn( workbook,format,columnNumber );
-			}
-		}
-	}
-
-	void function formatRow( required workbook,required struct format,required numeric row ){
-		var rowIndex = row-1;
-		var theRow = this.getActiveSheet( workbook ).getRow( rowIndex );
-		if( IsNull( theRow ) )
-			return;
-		var cellIterator = theRow.cellIterator();
-		while( cellIterator.hasNext() ){
-			formatCell( workbook,format,row,cellIterator.next().getColumnIndex()+1 );
-		}
-	}
-
-	void function formatRows( required workbook,required struct format,required string range ){
-		/* Validate and extract the ranges. Range is a comma-delimited list of ranges, and each value can be either a single number or a range of numbers with a hyphen. */
-		var allRanges = this.extractRanges( range );
-		for( var thisRange in allRanges ){
-			if( thisRange.startAt EQ thisRange.endAt ){
-				/* Just one row */
-				this.formatRow( workbook,format,thisRange.startAt );
-				continue;
-			}
-			for( var rowNumber=thisRange.startAt; rowNumber LTE thisRange.endAt; rowNumber++ ){
-				this.formatRow( workbook,format,rowNumber );
-			}
-		}
-	}
-
-	function getCellComment( required workbook,numeric row,numeric column ){
-		if( arguments.keyExists( "row" ) AND !arguments.KeyExists( "column" ) )
-			throw( type=exceptionType,message="Invalid argument combination",detail="If you specify the row you must also specify the column" );
-		if( arguments.keyExists( "column" ) AND !arguments.KeyExists( "row" ) )
-			throw( type=exceptionType,message="Invalid argument combination",detail="If you specify the column you must also specify the row" );
-		if( arguments.KeyExists( "row" ) ){
-			var cell = this.getCellAt( workbook,row,column );
-			var commentObject = cell.getCellComment();
-			if( !IsNull( commentObject ) ){
-				return {
-					author = commentObject.getAuthor()
-					,comment = commentObject.getString().getString()
-					,column = column
-					,row = row
-				}
-			}
-			return {};
-		}
-		/* TODO: Look into checking all sheets in the workbook */
-		/* row and column weren't provided so loop over the whole sheet and return all the comments as an array of structs */
-		var result = [];
-		var rowIterator = this.getActiveSheet( workbook ).rowIterator();
-		while( rowIterator.hasNext() ){
-			var cellIterator = rowIterator.next().cellIterator();
-			while( cellIterator.hasNext() ){
-				var commentObject = cellIterator.next().getCellComment();
-				if( !IsNull( commentObject ) ){
-					var comment = {
-						author = commentObject.getAuthor()
-						,comment = commentObject.getString().getString()
-						,column = column
-						,row = row
-					}
-					comments.Append( comment );
-				}
-			}
-		}
-		return comments;
-	}
-
-	function getCellFormula( required workbook,numeric row,numeric column ){
-		if( arguments.KeyExists( "row" ) AND arguments.KeyExists( "column" ) ){
-			if( cellExists( workbook,row,column ) ){
-				var cell = getCellAt( workbook,row,column );
-				if( cell.getCellType() IS cell.CELL_TYPE_FORMULA )
-					return cell.getCellFormula();
-				return "";
-			}
-		}
-		//no row and column provided so return an array of structs containing formulas for the entire sheet
-		var rowIterator = getActiveSheet( workbook ).rowIterator();
-		var formulas = [];
-		while( rowIterator.hasNext() ){
-			var cellIterator = rowIterator.next().cellIterator();
-			while( cellIterator.hasNext() ){
-				var cell = cellIterator.next();
-				var formulaStruct = {
-					row = ( cell.getRowIndex() + 1 )
-					,column = ( cell.getColumnIndex() + 1 )
-				};
-				try{
-					formulaStruct.formula = cell.getCellFormula();
-				}
-				catch( any exception ){
-					formulaStruct.formula = "";
-				}
-				if( formulaStruct.formula.Len() )
-					formulas.Append( formulaStruct );
-			}
-		}
-		return formulas;
-	}
-
-	function getCellValue( required workbook,required numeric row,required numeric column ){
-		if( !this.cellExists( workbook,row,column ) )
-			return "";
-		var rowIndex = row-1;
-		var columnIndex = column-1;
-		var rowObject = this.getActiveSheet( workbook ).getRow( JavaCast( "int",rowIndex ) );
-		var cell = rowObject.getCell( JavaCast( "int",columnIndex ) );
-		var formatter = this.getFormatter();
-		if( cell.getCellType() EQ cell.CELL_TYPE_FORMULA ){
-			var formulaEvaluator = workbook.getCreationHelper().createFormulaEvaluator();
-			return formatter.formatCellValue( cell,formulaEvaluator );
-		}
-		return formatter.formatCellValue( cell );
-	}
-
-	struct function info( required workbook ){
-		/* 
-		workbook properties returned in the struct are:
-			* AUTHOR
-			* CATEGORY
-			* COMMENTS
-			* CREATIONDATE
-			* LASTEDITED
-			* LASTAUTHOR
-			* LASTSAVED
-			* KEYWORDS
-			* MANAGER
-			* COMPANY
-			* SUBJECT
-			* TITLE
-			* SHEETS
-			* SHEETNAMES
-			* SPREADSHEETTYPE
-		 */
-		 //format specific metadata
-		var info = this.isBinaryFormat( workbook )? this.binaryInfo( workbook ): this.xmlInfo( workbook );
-		//common properties
-		info.sheets = workbook.getNumberOfSheets();
-		var sheetnames = [];
-		if( IsNumeric( info.sheets ) ){
-			for( var i=1; i LTE info.sheets; i++ ){
-				sheetnames.Append( workbook.getSheetName( JavaCast( "int",i-1 ) ) );
-			}
-			info.sheetnames = sheetnames.ToList();
-		}
-		info.spreadSheetType = this.isXmlFormat( workbook )? "Excel (2007)": "Excel";
-		return info; 
-	}
-
-	boolean function isBinaryFormat( required workbook ){
-		return workbook.getClass().getCanonicalName() IS "org.apache.poi.hssf.usermodel.HSSFWorkbook";
-	}
-
-	boolean function isXmlFormat( required workbook ){
-		return workbook.getClass().getCanonicalName() IS "org.apache.poi.xssf.usermodel.XSSFWorkbook";
-	}
-
-	void function mergeCells(
-		required workbook
-		,required numeric startRow
-		,required numeric endRow
-		,required numeric startColumn
-		,required numeric endColumn
-		,boolean emptyInvisibleCells=false
-	){
-		if( startRow LT 1 OR startRow GT endRow )
-			throw( type=exceptionType,message="Invalid startRow or endRow",detail="Row values must be greater than 0 and the startRow cannot be greater than the endRow." );
-		if( startColumn LT 1 OR startColumn GT endColumn )
-			throw( type=exceptionType,message="Invalid startColumn or endColumn",detail="Column values must be greater than 0 and the startColumn cannot be greater than the endColumn." );
-		var cellRangeAddress = loadPoi( "org.apache.poi.ss.util.CellRangeAddress" ).init(
-			JavaCast( "int",startRow - 1 )
-			,JavaCast( "int",endRow - 1 )
-			,JavaCast( "int",startColumn - 1 )
-			,JavaCast( "int",endColumn - 1 )
-		);
-		this.getActiveSheet( workbook ).addMergedRegion( cellRangeAddress );
-		if( !emptyInvisibleCells )
-			return;
-		// stash the value to retain
-		var visibleValue	=	getCellValue( workbook,startRow,startColumn );
-		//empty all cells in the merged region
-		setCellRangeValue( workbook,"",startRow,endRow,startColumn,endColumn );
-		//restore the stashed value
-		setCellValue( workbook,visibleValue,startRow,startColumn );
-	}
-
-	function new( string sheetName="Sheet1",boolean xmlformat=false ){
-		var workbook = this.createWorkBook( sheetName,xmlFormat );
-		this.createSheet( workbook,sheetName,xmlformat );
-		setActiveSheet( workbook,sheetName );
-		return workbook;
-	}
-
-	function read(
-		required string src
-		,string format
-		,string columns
-		,string columnNames
-		,numeric headerRow
-		,string rows
-		,string sheetName
-		,numeric sheetNumber // 1-based
-		,boolean includeHeaderRow=false
-		,boolean includeBlankRows=false
-		,boolean fillMergedCellsWithVisibleValue=false
-	){
-		if( arguments.KeyExists( "query" ) )
-			throw( type=exceptionType,message="Invalid argument 'query'.",details="Just use format='query' to return a query object" );
-		if( arguments.KeyExists( "format" ) AND !ListFindNoCase( "query,html,csv",format ) )
-			throw( type=exceptionType,message="Invalid format",detail="Supported formats are: 'query', 'html' and 'csv'" );
-		if( arguments.KeyExists( "sheetName" ) AND arguments.KeyExists( "sheetNumber" ) )
-			throw( type=exceptionType,message="Cannot provide both sheetNumber and sheetName arguments",detail="Only one of either 'sheetNumber' or 'sheetName' arguments may be provided." );
-		if( !FileExists( src ) )
-			throw( type=exceptionType,message="Non-existent file",detail="Cannot find the file #src#." );
-		var workbook = this.workbookFromFile( src );
-		if( arguments.KeyExists( "sheetName" ) )
-			this.setActiveSheet( workbook=workbook,sheetName=sheetName );
-		if( !arguments.keyExists( "format" ) )
-			return workbook;
-		var args = {
-			workbook = workbook
-		};
-		if( arguments.KeyExists( "sheetName" ) )
-			args.sheetName = sheetName;
-		if( arguments.KeyExists( "sheetNumber" ) )
-			args.sheetNumber = sheetNumber;
-		if( arguments.KeyExists( "headerRow" ) ){
-			args.headerRow=headerRow;
-			args.includeHeaderRow = includeHeaderRow;
-		}
-		if( arguments.KeyExists( "rows" ) )
-			args.rows = rows;
-		if( arguments.KeyExists( "columns" ) )
-			args.columns = columns;
-		if( arguments.KeyExists( "columnNames" ) )
-			args.columnNames = columnNames;
-		args.includeBlankRows=includeBlankRows;
-		args.fillMergedCellsWithVisibleValue=fillMergedCellsWithVisibleValue;
-		var generatedQuery=this.sheetToQuery( argumentCollection=args );
-		if( format IS "query" )
-			return generatedQuery;
-		var args={
-			query=generatedQuery
-		};
-		if( arguments.KeyExists( "headerRow" ) ){
-			args.headerRow=headerRow;
-			args.includeHeaderRow = includeHeaderRow;
-		}
-		switch( format ){
-			case "csv": return this.queryToCsv( argumentCollection=args );
-			case "html": return this.queryToHtml( argumentCollection=args );
-		}
-	}
-
-	binary function readBinary( required workbook ){
-		var baos = CreateObject( "Java","org.apache.commons.io.output.ByteArrayOutputStream" ).init();
-		workbook.write( baos );
-		baos.flush();
-		return baos.toByteArray();
-	}
-
-	void function removeSheet( required workbook,required string sheetName ){
-		validateSheetName( sheetName );
-		validateSheetExistsWithName( workbook,sheetName );
-		arguments.sheetNumber = workbook.getSheetIndex( sheetName )+1;
-		var sheetIndex = sheetNumber-1;
-		this.deleteSheetAtIndex( workbook,sheetIndex );
-	}
-
-	void function removeSheetNumber( required workbook,required numeric sheetNumber ){
-		validateSheetNumber( workbook,sheetNumber );
-		var sheetIndex = sheetNumber-1;
-		this.deleteSheetAtIndex( workbook,sheetIndex );
-	}
-
-	void function renameSheet( required workbook,required string sheetName,required numeric sheetNumber ){
-		this.validateSheetName( sheetName );
-		this.validateSheetNumber( workbook,sheetNumber );
-		var sheetIndex = sheetNumber-1;
-		var foundAt = workbook.getSheetIndex( JavaCast( "string",sheetName ) );
-		if( ( foundAt GT 0 ) AND ( foundAt NEQ sheetIndex ) )
-			throw( type=exceptionType,message="Invalid Sheet Name [#sheetName#]",detail="The workbook already contains a sheet named [#sheetName#]. Sheet names must be unique" );
-		workbook.setSheetName( JavaCast( "int",sheetIndex ),JavaCast( "string",sheetName ) );
-	}
-
-	void function setActiveSheet( required workbook,string sheetName,numeric sheetNumber ){
-		this.validateSheetNameOrNumberWasProvided( argumentCollection=arguments );
-		if( arguments.KeyExists( "sheetName" ) ){
-			this.validateSheetExistsWithName( workbook,sheetName );
-			sheetNumber = workbook.getSheetIndex( JavaCast( "string",sheetName ) ) + 1;
-		}
-		this.validateSheetNumber( workbook,sheetNumber )
-		workbook.setActiveSheet( JavaCast( "int",sheetNumber - 1 ) );
-	}
-
-	void function setActiveSheetNumber( required workbook,numeric sheetNumber ){
-		this.setActiveSheet( argumentCollection=arguments );
-	}
-
-	void function setCellComment(
-		required workbook
-		,required struct comment
-		,required numeric row
-		,required numeric column
-	){
-		/* 
-		The comment struct may contain the following keys: 
-			* anchor
-			* author
-			* bold
-			* color
-			* comment
-			* fillcolor
-			* font
-			* horizontalalignment
-			* italic
-			* linestyle
-			* linestylecolor
-			* size
-			* strikeout
-			* underline
-			* verticalalignment
-			* visible
-		 */
-		var drawingPatriarch = this.getActiveSheet( workbook ).createDrawingPatriarch();
-		var commentString = this.loadPoi( "org.apache.poi.hssf.usermodel.HSSFRichTextString" ).init( JavaCast( "string",comment.comment ) );
-		var javaColorRGB = 0;
-		if( comment.KeyExists( "anchor" ) )
-			var clientAnchor = loadPoi( "org.apache.poi.hssf.usermodel.HSSFClientAnchor" ).init(
-				JavaCast( "int",0 )
-				,JavaCast( "int",0 )
-				,JavaCast( "int",0 )
-				,JavaCast( "int",0 )
-				,JavaCast( "int",ListGetAt( comment.anchor,1 ) )
-				,JavaCast( "int",ListGetAt( comment.anchor,2 ) )
-				,JavaCast( "int",ListGetAt( comment.anchor,3 ) )
-				,JavaCast( "int",ListGetAt( comment.anchor,4 ) )
-			);
-		else
-			var clientAnchor = loadPoi( "org.apache.poi.hssf.usermodel.HSSFClientAnchor" ).init(
-				JavaCast( "int",0 )
-				,JavaCast( "int",0 )
-				,JavaCast( "int",0 )
-				,JavaCast( "int",0 )
-				,JavaCast( "int",column )
-				,JavaCast( "int",row )
-				,JavaCast( "int",column+2 )
-				,JavaCast( "int",row+2 )
-			);
-		var commentObject = drawingPatriarch.createComment( clientAnchor );
-		if( comment.KeyExists( "author" ) )
-			commentObject.setAuthor( JavaCast( "string",comment.author ) );
-		/* If we're going to do anything font related, need to create a font. Didn't really want to create it above since it might not be needed.  */
-		if( comment.KeyExists( "bold" ) 
-				OR comment.KeyExists( "color" ) 
-				OR comment.KeyExists( "font" )
-				OR comment.KeyExists( "italic" )
-				OR comment.KeyExists( "size" ) 
-				OR comment.KeyExists( "strikeout" ) 
-				OR comment.KeyExists( "underline" )
-		){
-			var font = workbook.createFont();
-			if( comment.KeyExists( "bold" ) ){
-				if( comment.bold )
-					font.setBoldWeight( font.BOLDWEIGHT_BOLD );
-				else
-					font.setBoldWeight( font.BOLDWEIGHT_NORMAL );
-			}
-			if( comment.KeyExists( "color" ) )
-				font.setColor( JavaCast( "int",getColorIndex( comment.color ) ) );
-			if( comment.KeyExists( "font" ) )
-				font.setFontName( JavaCast( "string",comment.font ) );
-			if( comment.KeyExists( "italic" ) )
-				font.setItalic( JavaCast( "string",comment.italic ) );
-			if( comment.KeyExists( "size" ) )
-				font.setFontHeightInPoints( JavaCast( "int",comment.size ) );
-			if( comment.KeyExists( "strikeout" ) )
-				font.setStrikeout( JavaCast( "boolean",comment.strikeout ) );
-			if( comment.KeyExists( "underline" ) )
-				font.setUnderline( JavaCast( "boolean",comment.underline ) );
-			commentString.applyFont( font );
-		}
-		if( comment.KeyExists( "fillColor" ) ){
-			javaColorRGB = this.getJavaColorRGB( comment.fillColor );
-			commentObject.setFillColor(
-				JavaCast( "int",javaColorRGB.red )
-				,JavaCast( "int",javaColorRGB.green )
-				,JavaCast( "int",javaColorRGB.blue )
-			);
-		}
-		/* 
-			Horizontal alignment can be left, center, right, justify, or distributed. Note that the constants on the Java class are slightly different in some cases:
-			'center' = CENTERED
-			'justify' = JUSTIFIED
-		 */
-		if( comment.KeyExists( "horizontalAlignment" ) ){
-			if( comment.horizontalAlignment.UCase() IS "CENTER" )
-				comment.horizontalAlignment = "CENTERED";
-			if( comment.horizontalAlignment.UCase() IS "JUSTIFY" )
-				comment.horizontalAlignment = "JUSTIFIED";
-			commentObject.setHorizontalAlignment( JavaCast( "int",commentObject[ "HORIZONTAL_ALIGNMENT_" & comment.horizontalalignment.UCase() ] ) );
-		}
-		/* 
-		Valid values for linestyle are:
-				* solid
-				* dashsys
-				* dashdotsys
-				* dashdotdotsys
-				* dotgel
-				* dashgel
-				* longdashgel
-				* dashdotgel
-				* longdashdotgel
-				* longdashdotdotgel
-		 */
-		if( comment.KeyExists( "lineStyle" ) )
-		 	commentObject.setLineStyle( JavaCast( "int",commentObject[ "LINESTYLE_" & comment.lineStyle.UCase() ] ) );
-		if( comment.KeyExists( "lineStyleColor" ) ){
-			javaColorRGB = this.getJavaColorRGB( comment.lineStyleColor );
-			commentObject.setLineStyleColor(
-				JavaCast( "int",javaColorRGB.red )
-				,JavaCast( "int",javaColorRGB.green )
-				,JavaCast( "int",javaColorRGB.blue )
-			);
-		}
-		/* Vertical alignment can be top, center, bottom, justify, and distributed. Note that center and justify are DIFFERENT than the constants for horizontal alignment, which are CENTERED and JUSTIFIED. */
-		if( comment.KeyExists( "verticalAlignment" ) )
-			commentObject.setVerticalAlignment( JavaCast( "int",commentObject[ "VERTICAL_ALIGNMENT_" & comment.verticalAlignment.UCase() ] ) );
-		if( comment.KeyExists( "visible" ) )
-			commentObject.setVisible( JavaCast( "boolean",comment.visible ) );//doesn't seem to work
-		commentObject.setString( commentString );
-		var cell = this.initializeCell( workbook,row,column );
-		cell.setCellComment( commentObject );
-	}
-
-	void function setCellFormula( required workbook,required string formula,required numeric row,required numeric column ){
-		//Automatically create the cell if it does not exist, instead of throwing an error
-		var cell = initializeCell( workbook,row,column );
-		cell.setCellFormula( JavaCast( "string",formula ) );
-	}
-
-	void function setCellValue( required workbook,required value,required numeric row,required numeric column ){
-		//Automatically create the cell if it does not exist, instead of throwing an error
-		var cell = initializeCell( workbook,row,column );
-		this.setCellValueAsType( workbook,cell,value );
-	}
-
-	void function setCellRangeValue(
-		required workbook
-		,required value
-		,required numeric startRow
-		,required numeric endRow
-		,required numeric startColumn
-		,required numeric endColumn
-	){
-		/* Sets the same value to a range of cells */
-		for( var rowNumber=startRow; rowNumber LTE endRow; rowNumber++ ){
-			for( var columnNumber=startColumn; columnNumber LTE endColumn; columnNumber++ ){
-				setCellValue( workbook,value,rowNumber,columnNumber );
-			}
-		}
-	}
-
-	void function setColumnWidth( required workbook,required numeric column,required numeric width ){
-		var columnIndex = column-1;
-		this.getActiveSheet( workbook ).setColumnWidth( JavaCast( "int",columnIndex ),JavaCast( "int",width*256 ) );
-	}
-
-	void function setFooter(
-		required workbook
-		,string leftFooter=""
-		,string centerFooter=""
-		,string rightFooter=""
-	){
-		if( !centerFooter.isEmpty() )
-			this.getActiveSheet( workbook ).getFooter().setCenter( JavaCast( "string",centerFooter ) );
-		if( !leftFooter.isEmpty() )
-			this.getActiveSheet( workbook ).getFooter().setleft( JavaCast( "string",leftFooter ) );
-		if( !rightFooter.isEmpty() )
-			this.getActiveSheet( workbook ).getFooter().setright( JavaCast( "string",rightFooter ) );
-	}
-
-	void function setHeader(
-		required workbook
-		,string leftHeader=""
-		,string centerHeader=""
-		,string rightHeader=""
-	){
-		if( !centerHeader.isEmpty() )
-			this.getActiveSheet( workbook ).getHeader().setCenter( JavaCast( "string",centerHeader ) );
-		if( !leftHeader.isEmpty() )
-			this.getActiveSheet( workbook ).getHeader().setleft( JavaCast( "string",leftHeader ) );
-		if( !rightHeader.isEmpty() )
-			this.getActiveSheet( workbook ).getHeader().setright( JavaCast( "string",rightHeader ) );
-	}
-
-	void function setRowHeight( required workbook,required numeric row,required numeric height ){
-		var rowIndex = row-1;
-		this.getActiveSheet( workbook ).getRow( JavaCast( "int",rowIndex ) ).setHeightInPoints( JavaCast( "int",height ) );
-	}
-
-	void function shiftColumns( required workbook,required numeric start,numeric end=start,numeric offset=1 ){
-		if( start LTE 0 )
-			throw( type=exceptionType,message="Invalid start value",detail="The start value must be greater than or equal to 1" );
-		if( arguments.KeyExists( "end" ) AND ( end LTE 0 OR end LT start ) )
-			throw( type=exceptionType,message="Invalid end value",detail="The end value must be greater than or equal to the start value" );
-		var rowIterator = this.getActiveSheet( workbook ).rowIterator();
-		var startIndex = start-1;
-		var endIndex = arguments.KeyExists( "end" )? end-1: startIndex;
-		while( rowIterator.hasNext() ){
-			var row = rowIterator.next();
-			if( offset GT 0 ){
-				for( var i=endIndex; i GTE startIndex; i-- ){
-					var tempCell = row.getCell( JavaCast( "int",i ) );
-					var cell = this.createCell( row,i+offset );
-					if( !IsNull( tempCell ) ){
-						this.setCellValueAsType( workbook,cell,this.getCellValueAsType( workbook,tempCell ) );
-						cell.setCellStyle( tempCell.getCellStyle() );
-					}
-				}
-			} else {
-				for( var i=startIndex; i LTE endIndex; i++ ){
-					var tempCell = row.getCell( JavaCast( "int",i ) );
-					var cell = createCell( row,i+offset );
-					if( !IsNull( tempCell ) ){
-						this.setCellValueAsType( workbook,cell,this.getCellValueAsType( workbook,tempCell ) );
-						cell.setCellStyle( tempCell.getCellStyle() );
-					}
-				}
-			}
-		}
-		// clean up any columns that need to be deleted after the shift
-		var numberColsShifted = ( endIndex-startIndex )+1;
-		var numberColsToDelete = Abs( offset );
-		if( numberColsToDelete GT numberColsShifted )
-			numberColsToDelete = numberColsShifted;
-		if( offset GT 0 ){
-			var stopValue = ( startIndex + numberColsToDelete )-1;
-			for( var i=startIndex; i LTE stopValue; i++ ){
-				this.deleteColumn( workbook,i+1 );
-			}
-			return;
-		}
-		var stopValue = ( endIndex - numberColsToDelete )+1;
-		for( var i=endIndex; i GTE stopValue; i-- ){
-			this.deleteColumn( workbook,i+1 );
-		}
-	}
-
-	void function shiftRows( required workbook,required numeric start,numeric end=start,numeric offset=1 ){
-		this.getActiveSheet( workbook ).shiftRows(
-			JavaCast( "int",arguments.start - 1 )
-			,JavaCast( "int",arguments.end - 1 )
-			,JavaCast( "int",arguments.offset )
-		);
-	}
-
-	void function write( required workbook,required string filepath,boolean overwrite=false,string password ){
-		if( !overwrite AND FileExists( filepath ) )
-			throw( type=exceptionType,message="File already exists",detail="The file path specified already exists. Use 'overwrite=true' if you wish to overwrite it." );
-		// writeProtectWorkbook takes both a user name and a password, but since CF 9 tag only takes a password, just making up a user name 
-		// TODO: workbook.isWriteProtected() returns true but the workbook opens without prompting for a password
-		if( arguments.KeyExists( "password" ) AND !password.Trim().IsEmpty() )
-			workbook.writeProtectWorkbook( JavaCast( "string",password ),JavaCast( "string","user" ) );
-		lock name="#filepath#" timeout=5{
-			var outputStream = CreateObject( "java","java.io.FileOutputStream" ).init( filepath );
-		}
-		try{
-			lock name="#filepath#" timeout=5{
-				workbook.write( outputStream );
-			}
-			outputStream.flush();
-		}
-		finally{
-			// always close the stream. otherwise file may be left in a locked state if an unexpected error occurs
-			outputStream.close();
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/models/SpreadSheet/formatting.cfm b/models/SpreadSheet/formatting.cfm
deleted file mode 100644
index c710109..0000000
--- a/models/SpreadSheet/formatting.cfm
+++ /dev/null
@@ -1,181 +0,0 @@
-<cfscript>
-private any function buildCellStyle( required workbook,required struct format ){
-	/*  TODO: Reuse styles  */
-	var cellStyle = workbook.createCellStyle();
-	var formatter = workbook.getCreationHelper().createDataFormat();
-	var font = 0;
-	var setting = 0;
-	var settingValue = 0;
-	var formatIndex = 0;
-	/* 
-		Valid values of the format struct are:
-		* alignment
-		* bold
-		* bottomborder
-		* bottombordercolor
-		* color
-		* dataformat
-		* fgcolor
-		* fillpattern
-		* font
-		* fontsize
-		* hidden
-		* indent
-		* italic
-		* leftborder
-		* leftbordercolor
-		* locked
-		* rightborder
-		* rightbordercolor
-		* rotation
-		* strikeout
-		* textwrap
-		* topborder
-		* topbordercolor
-		* underline
-		* verticalalignment  (added in CF9.0.1)
-	 */
-	for( var setting in format ){
-		settingValue = UCase( format[ setting ] );
-		switch( setting ){
-			case "alignment":
-				cellStyle.setAlignment( cellStyle[ "ALIGN_" & settingValue ] );
-			break;
-			case "bold":
-				font = cloneFont( workbook,workbook.getFontAt( cellStyle.getFontIndex() ) );
-				if( format.KeyExists( setting ) )
-					font.setBoldweight( font.BOLDWEIGHT_BOLD );
-				else
-					font.setBoldweight( font.BOLDWEIGHT_NORMAL )
-				cellStyle.setFont( font );
-			break;
-			case "bottomborder":
-				cellStyle.setBorderBottom( Evaluate( "cellStyle." & "BORDER_" & UCase( StructFind( format,setting ) ) ) );
-			break;
-			case "bottombordercolor":
-				cellStyle.setBottomBorderColor( JavaCast( "int",getColorIndex( StructFind( format,setting ) ) ) );
-			break;
-			case "color":
-				font = cloneFont( workbook,workbook.getFontAt( cellStyle.getFontIndex() ) );
-				font.setColor( getColorIndex( StructFind( format,setting ) ) );
-				cellStyle.setFont( font );
-			break;
-			/*  TODO: this is returning the correct data format index from HSSFDataFormat but doesn't seem to have any effect on the cell. Could be that I'm testing with OpenOffice so I'll have to check things in MS Excel  */
-			case "dataformat":
-				cellStyle.setDataFormat( formatter.getFormat( JavaCast( "string",format[ setting ] ) ) );
-			break;
-			case "fgcolor":
-				cellStyle.setFillForegroundColor( getColorIndex( StructFind( format,setting ) ) );
-				/*  make sure we always apply a fill pattern or the color will not be visible  */
-				if( !arguments.KeyExists( "fillpattern" ) )
-					cellStyle.setFillPattern( cellStyle.SOLID_FOREGROUND );
-			break;
-			/*  TODO: CF 9 docs list "nofill" as opposed to "no_fill"; docs wrong? The rest match POI settings exactly.If it really is nofill instead of no_fill, just change to no_fill before calling setFillPattern  */
-			case "fillpattern":
-				cellStyle.setFillPattern( Evaluate( "cellStyle." & UCase( StructFind( format,setting ) ) ) );
-			break;
-			case "font":
-				font = cloneFont( workbook,workbook.getFontAt( cellStyle.getFontIndex() ) );					
-				font.setFontName( JavaCast( "string",StructFind( format,setting ) ) );
-				cellStyle.setFont( font );
-			break;
-			case "fontsize":
-				font = cloneFont( workbook,workbook.getFontAt( cellStyle.getFontIndex() ) );					
-				font.setFontHeightInPoints( JavaCast( "int",StructFind( format,setting ) ) );
-				cellStyle.setFont( font );
-			break;
-			/*  TODO: I may just not understand what's supposed to be happening here, but this doesn't seem to do anything */
-			case "hidden":
-				cellStyle.setHidden( JavaCast( "boolean",StructFind( format, setting ) ) );
-			break;
-			/*  TODO: I may just not understand what's supposed to be happening here, but this doesn't seem to do anything */
-			case "indent":
-				cellStyle.setIndention( JavaCast( "int",StructFind( format, setting ) ) );
-			break;
-			case "italic":
-				font = cloneFont( workbook,workbook.getFontAt( cellStyle.getFontIndex ( ) ) );
-				if( StructFind( format,setting ) )
-					font.setItalic( JavaCast( "boolean",true ) );
-				else
-					font.setItalic( JavaCast( "boolean",false ) );
-				cellStyle.setFont( font );
-			break;
-			case "leftborder":
-				cellStyle.setBorderLeft( Evaluate("cellStyle." & "BORDER_" & UCase( StructFind( format,setting ) ) ) );
-			break;
-			case "leftbordercolor":
-				cellStyle.setLeftBorderColor( getColorIndex( StructFind( format,setting ) ) );
-			break;
-			/*  TODO: I may just not understand what's supposed to be happening here, but this doesn't seem to do anything */
-			case "locked":
-				cellStyle.setLocked( JavaCast( "boolean",StructFind( format,setting ) ) );
-			break;
-			case "rightborder":
-				cellStyle.setBorderRight( Evaluate("cellStyle." & "BORDER_" & UCase( StructFind( format,setting ) ) ) );
-			break;
-			case "rightbordercolor":
-				cellStyle.setRightBorderColor( getColorIndex( StructFind( format,setting ) ) );
-			break;
-			case "rotation":
-				cellStyle.setRotation( JavaCast( "int",StructFind( format,setting ) ) );
-			break;
-			case "strikeout":
-				font = cloneFont( workbook,workbook.getFontAt( cellStyle.getFontIndex() ) );
-				if( StructFind( format,setting ) )
-					font.setStrikeout( JavaCast( "boolean",true ) );
-				else
-					font.setStrikeout( JavaCast( "boolean",false ) );
-				cellStyle.setFont( font );
-			break;
-			case "textwrap":
-				cellStyle.setWrapText( JavaCast( "boolean",StructFind( format,setting ) ) );
-			break;
-			case "topborder":
-				cellStyle.setBorderTop( Evaluate( "cellStyle." & "BORDER_" & UCase( StructFind( format,setting ) ) ) );
-			break;
-			case "topbordercolor":
-				cellStyle.setTopBorderColor( getColorIndex( StructFind( format,setting ) ) );
-			break;
-			case "underline":
-				font = cloneFont( workbook,workbook.getFontAt( cellStyle.getFontIndex() ) );
-				if( StructFind( format,setting ) )
-					font.setUnderline( JavaCast( "boolean",true ) );
-				else
-					font.setUnderline( JavaCast( "boolean",false ) );
-				cellStyle.setFont( font );
-			break;
-			case "verticalalignment":
-				cellStyle.setVerticalAlignment( cellStyle[ settingValue ] );
-			break;
-		}
-	}
-	return cellStyle;
-}
-
-private any function cloneFont( required workbook,required fontToClone ){
-	var newFont = workbook.createFont();
-	/*  copy the existing cell's font settings to the new font  */
-	newFont.setBoldweight( fontToClone.getBoldweight() );
-	newFont.setCharSet( fontToClone.getCharSet() );
-	newFont.setColor( fontToClone.getColor() );
-	newFont.setFontHeight( fontToClone.getFontHeight() );
-	newFont.setFontName( fontToClone.getFontName() );
-	newFont.setItalic( fontToClone.getItalic() );
-	newFont.setStrikeout( fontToClone.getStrikeout() );
-	newFont.setTypeOffset( fontToClone.getTypeOffset() );
-	newFont.setUnderline( fontToClone.getUnderline() );
-	return newFont;
-}
-
-private numeric function getColorIndex( required string colorName ){
-	try{
-		var findColor = colorName.Trim().UCase();
-		var IndexedColors = CreateObject( "Java","org.apache.poi.ss.usermodel.IndexedColors" );
-		var color	= IndexedColors.valueOf( JavaCast( "string",findColor ) );
-		return color.getIndex();
-	}
-	catch( any exception ){
-		throw( type=exceptionType,message="Invalid Color",detail="The color provided (#colorName#) is not valid." );
-	}
-}
-</cfscript>
\ No newline at end of file
diff --git a/models/SpreadSheet/lib/poi-3.12-20150511.jar b/models/SpreadSheet/lib/poi-3.12-20150511.jar
deleted file mode 100644
index a4f4263..0000000
Binary files a/models/SpreadSheet/lib/poi-3.12-20150511.jar and /dev/null differ
diff --git a/models/SpreadSheet/lib/poi-ooxml-3.12-20150511.jar b/models/SpreadSheet/lib/poi-ooxml-3.12-20150511.jar
deleted file mode 100644
index a7222d4..0000000
Binary files a/models/SpreadSheet/lib/poi-ooxml-3.12-20150511.jar and /dev/null differ
diff --git a/models/SpreadSheet/lib/poi-ooxml-schemas-3.12-20150511.jar b/models/SpreadSheet/lib/poi-ooxml-schemas-3.12-20150511.jar
deleted file mode 100644
index 5fcc65a..0000000
Binary files a/models/SpreadSheet/lib/poi-ooxml-schemas-3.12-20150511.jar and /dev/null differ
diff --git a/models/SpreadSheet/lib/xmlbeans-2.6.0.jar b/models/SpreadSheet/lib/xmlbeans-2.6.0.jar
deleted file mode 100644
index d1b6627..0000000
Binary files a/models/SpreadSheet/lib/xmlbeans-2.6.0.jar and /dev/null differ
diff --git a/models/SpreadSheet/tools.cfm b/models/SpreadSheet/tools.cfm
deleted file mode 100644
index 3662664..0000000
--- a/models/SpreadSheet/tools.cfm
+++ /dev/null
@@ -1,783 +0,0 @@
-<cfscript>
-private void function addInfoBinary( required workbook,required struct info ){
-	workbook.createInformationProperties(); // creates the following if missing
-	var documentSummaryInfo = workbook.getDocumentSummaryInformation();
-	var summaryInfo = workbook.getSummaryInformation();	
-	for( var key in info ){
-		var value = JavaCast( "string",info[ key ] );
-		switch( key ){
-			case "author": 				
-				summaryInfo.setAuthor( value );
-				break;
-			case "category":
-				documentSummaryInfo.setCategory( value );
-				break;
-			case "lastauthor":
-				summaryInfo.setLastAuthor( value );
-				break;
-			case "comments":
-				summaryInfo.setComments( value );	
-				break;
-			case "keywords":
-				summaryInfo.setKeywords( value );
-				break;
-			case "manager":
-				documentSummaryInfo.setManager( value );
-				break;
-			case "company":
-				documentSummaryInfo.setCompany( value );
-				break;
-			case "subject":
-				summaryInfo.setSubject( value );
-				break;
-			case "title":
-				summaryInfo.setTitle( value );
-				break;
-		}
-	}	
-}
-
-private void function addInfoXml( required workbook,required struct info ){
-	var documentProperties = workbook.getProperties().getExtendedProperties().getUnderlyingProperties();
-	var coreProperties = workbook.getProperties().getCoreProperties();
-	for( var key in info ){
-		var value = JavaCast( "string",info[ key ] );
-		switch( key ){
-			case "author": 				
-				coreProperties.setCreator( value  );
-				break;
-			case "category": 				
-				coreProperties.setCategory( value );
-				break;
-			case "lastauthor": 
-				coreProperties.getUnderlyingProperties().setLastModifiedByProperty( value );
-				break;
-			case "comments": 				
-				coreProperties.setDescription( value );	
-				break;
-			case "keywords": 				
-				coreProperties.setKeywords( value );
-				break;
-			case "subject": 				
-				coreProperties.setSubjectProperty( value );
-				break;
-			case "title": 				
-				coreProperties.setTitle( value );
-				break;
-			case "manager": 	
-				documentProperties.setManager( value );
-				break;
-			case "company": 				
-				documentProperties.setCompany( value );
-				break;
-		}
-	}
-}
-
-private void function addRowToSheetData( required workbook,required struct sheet,required numeric rowIndex ){
-	if( ( rowIndex EQ sheet.headerRowIndex ) AND !sheet.includeHeaderRow )
-		return;
-	var rowData=[];
-	var row=sheet.object.GetRow( JavaCast( "int",rowIndex ) );
-	if( IsNull( row ) ){
-		if( sheet.includeBlankRows )
-			sheet.data.Append( rowData );
-		return;
-	}
-	if( rowIsEmpty( row ) AND !sheet.includeBlankRows )
-		return;
-	rowData=getRowData( workbook,row,sheet.columnRanges );
-	sheet.data.Append( rowData );
-	if( !sheet.columnRanges.Len() ){
-		var rowColumnCount = row.GetLastCellNum();
-		sheet.totalColumnCount = Max( sheet.totalColumnCount,rowColumnCount );
-	}
-}
-
-private struct function binaryInfo( required workbook ){
-	var documentProperties = workbook.getDocumentSummaryInformation();
-	var coreProperties = workbook.getSummaryInformation();
-	return {
-		author = coreProperties.getAuthor()?:""
-		,category = documentProperties.getCategory()?:""
-		,comments = coreProperties.getComments()?:""
-		,creationDate = coreProperties.getCreateDateTime()?:""
-		,lastEdited = ( coreProperties.getEditTime() EQ 0 )? "": CreateObject( "java","java.util.Date" ).init( coreProperties.getEditTime() )
-		,subject = coreProperties.getSubject()?:""
-		,title = coreProperties.getTitle()?:""
-		,lastAuthor = coreProperties.getLastAuthor()?:""
-		,keywords = coreProperties.getKeywords()?:""
-		,lastSaved = coreProperties.getLastSaveDateTime()?:""
-		,manager = documentProperties.getManager()?:""
-		,company = documentProperties.getCompany()?:""
-	};
-}
-
-private boolean function cellExists( required workbook,required numeric rowNumber,required numeric columnNumber ){
-	var rowIndex = rowNumber-1;
-	var columnIndex = columnNumber-1;
-	var checkRow = this.getActiveSheet( workbook ).getRow( JavaCast( "int",rowIndex ) );
-	return !IsNull( checkRow ) AND !IsNull( checkRow.getCell( JavaCast( "int",columnIndex ) ) );
-}
-
-private numeric function columnCountFromRanges( required array ranges ){
-	var result=0;
-	for( var thisRange in ranges ){
-		for( var i=thisRange.startAt; i LTE thisRange.endAt; i++ ){
-			result++;
-		}
-	}
-	return result;
-}
-
-private function createCell( required row,numeric cellNum=arguments.row.getLastCellNum(),overwrite=true ){
-	/* get existing cell (if any)  */
-	var cell = row.getCell( JavaCast( "int",cellNum ) );
-	if( overwrite AND !IsNull( cell ) )
-		arguments.row.removeCell( cell );/* forcibly remove the existing cell  */
-	if( overwrite OR IsNull( cell ) )
-		cell = row.createCell( JavaCast( "int",cellNum ) );/* create a brand new cell  */
-	return cell;
-}
-
-private function createRow( required workbook,numeric rowNum=getNextEmptyRow( workbook ),boolean overwrite=true ){
-	/* get existing row (if any)  */
-	var row = getActiveSheet( workbook ).getRow( JavaCast( "int",rowNum ) );
-	if( overwrite AND !IsNull( row ) )
-		getActiveSheet( workbook ).removeRow( row ) /* forcibly remove existing row and all cells  */
-	if( overwrite OR IsNull( getActiveSheet( workbook ).getRow( JavaCast( "int",rowNum ) ) ) )
-		row = getActiveSheet( workbook ).createRow( JavaCast("int", rowNum ) );
-	return row;
-}
-
-private function createWorkBook( required string sheetName,boolean useXmlFormat=false ){
-	this.validateSheetName( sheetName );
-	var className = useXmlFormat? "org.apache.poi.xssf.usermodel.XSSFWorkbook": "org.apache.poi.hssf.usermodel.HSSFWorkbook";
-	return loadPoi( className ).init();
-}
-
-private void function deleteSheetAtIndex( required workbook,required numeric sheetIndex ){
-	workbook.removeSheetAt( JavaCast( "int",sheetIndex ) );
-}
-
-private numeric function estimateColumnWidth( required workbook,required any value ){
-	/* Estimates approximate column width based on cell value and default character width. */
-	/* 
-	"Excel bases its measurement of column widths on the number of digits (specifically, the number of zeros) in the column, using the Normal style font."
-	This function approximates the column width using the number of characters and the default character width in the normal font. POI expresses the width in 1/256 of Excel's character unit. The maximum size in POI is: (255 * 256)
-	*/
-	var defaultWidth = getDefaultCharWidth( workbook );
-	var numOfChars = Len( arguments.value );
-	var width = ( numOfChars*defaultWidth+5 ) / ( defaultWidth*256 );
-    // Do not allow the size to exceed POI's maximum
-	return Min( width,( 255*256 ) );
-}
-
-private array function extractRanges( required string rangeList ){
-	/*
-	A range is a comma-delimited list of ranges, and each value can be either a single number or a range of numbers with a hyphen. Ignores any white space.
-	Parses and validates a list of row/column numbers. Returns an array of structures with the keys: startAt, endAt
-	*/
-	var result = [];
-	var rangeTest = "^[0-9]{1,}(-[0-9]{1,})?$";
-	var ranges = ListToArray( rangeList );
-	for( var thisRange in ranges ){
-		/* remove all white space */
-		thisRange.REReplace( "\s+","","ALL" );
-		if( !REFind( rangeTest,thisRange ) )
-			throw( type=exceptionType,message="Invalid range value",detail="The range value '#thisRange#' is not valid." );
-		var parts = ListToArray( thisRange,"-" );
-		//if this is a single number, the start/endAt values are the same
-		var range = {
-			startAt = parts[ 1 ]
-			,endAt = parts[ parts.Len() ]
-		};
-		result.Append( range );
-	}
-	return result;
-}
-
-private string function filenameSafe( required string input ){
-	var charsToRemove	=	"\|\\\*\/\:""<>~&";
-	var result = input.REReplace( "[#charsToRemove#]+","","ALL" ).Left( 255 );
-	if( result.isEmpty() )
-		return	"renamed"; // in case all chars have been replaced (unlikely but possible)
-	return result;
-}
-
-private void function fillMergedCellsWithVisibleValue( required workbook,required sheet ){
-	if( !sheetHasMergedRegions( sheet ) )
-		return;
-	for( var regionIndex=0; regionIndex LT sheet.getNumMergedRegions(); regionIndex++ ){
-		var region=sheet.getMergedRegion( regionIndex );
-		var regionStartRowNumber=region.getFirstRow()+1;
-		var regionEndRowNumber=region.getLastRow()+1;
-		var regionStartColumnNumber=region.getFirstColumn()+1;
-		var regionEndColumnNumber=region.getLastColumn()+1;
-		var visibleValue=getCellValue( workbook,regionStartRowNumber,regionStartColumnNumber );
-		setCellRangeValue( workbook,visibleValue,regionStartRowNumber,regionEndRowNumber,regionStartColumnNumber,regionEndColumnNumber );
-	}
-}
-
-private string function generateUniqueSheetName( required workbook ){
-	/* Generates a unique sheet name (Sheet1, Sheet2, etecetera). */
-	var startNumber = workbook.getNumberOfSheets()+1;
-	var maxRetry = startNumber+250;
-	for( var sheetNumber=startNumber; sheetNumber LTE maxRetry; sheetNumber++ ){
-		var proposedName = "Sheet" & sheetNumber;
-		if( !sheetExists( workbook,proposedName ) )
-			return proposedName;
-	}
-	/* this should never happen. but if for some reason it did, warn the action failed and abort */
-	throw( type=exceptionType,message="Unable to generate name",detail="Unable to generate a unique sheet name" );
-}
-
-private function getActiveSheet( required workbook ){
-	return workbook.getSheetAt( JavaCast( "int",workbook.getActiveSheetIndex() ) );
-}
-
-private function getActiveSheetName( required workbook ){
-	return this.getActiveSheet( workbook ).getSheetName();
-}
-
-private numeric function getAWTFontStyle( required any poiFont ){
-	var font = loadPOI( "java.awt.Font" );
-	var isBold = poiFont.getBoldweight() == poiFont.BOLDWEIGHT_BOLD;
-	if( isBold && arguments.poiFont.getItalic() )
-  	return BitOr( font.BOLD,font.ITALIC );
-	if( isBold )
-		return font.BOLD;
-	if( poiFont.getItalic() )
-		return font.ITALIC;
-	return font.PLAIN;	
-}
-
-private function getCellAt( required workbook,required numeric rowNumber,required numeric columnNumber ){
-	if( !cellExists( argumentCollection=arguments ) )
-		throw( type=exceptionType,message="Invalid cell",detail="The requested cell [#rowNumber#,#columnNumber#] does not exist in the active sheet" );
-	var rowIndex = rowNumber-1;
-	var columnIndex = columnNumber-1;
-	return getActiveSheet( workbook ).getRow( JavaCast( "int",rowIndex ) ).getCell( JavaCast( "int",columnIndex ) );
-}
-
-private function getCellUtil(){
-	if( IsNull( variables.cellUtil ) )
-		variables.cellUtil = loadPoi( "org.apache.poi.ss.util.CellUtil" );
-	return variables.cellUtil;
-}
-
-private function getCellValueAsType( required workbook,required cell ){
-	/* When getting the value of a cell, it is important to know what type of cell value we are dealing with. If you try to grab the wrong value type, an error might be thrown. For that reason, we must check to see what type of cell we are working with. These are the cell types and they are constants of the cell object itself:
-		 		
-		0 - CELL_TYPE_NUMERIC
-		1 - CELL_TYPE_STRING
-		2 - CELL_TYPE_FORMULA
-		3 - CELL_TYPE_BLANK
-		4 - CELL_TYPE_BOOLEAN
-		5 - CELL_TYPE_ERROR */
-	
-	var cellType = cell.GetCellType();
-	/* Get the value of the cell based on the data type. The thing to worry about here is cell forumlas and cell dates. Formulas can be strange and dates are stored as numeric types. Here I will just grab dates as floats and formulas I will try to grab as numeric values. */
-	if( cellType EQ cell.CELL_TYPE_NUMERIC ){
-		/* Get numeric cell data. This could be a standard number, could also be a date value. */
-		var dateUtil = this.getDateUtil();
-		if( dateUtil.isCellDateFormatted( cell ) )
-			return cell.getDateCellValue();
-		return cell.getNumericCellValue();
-	}
-	if( cellType EQ cell.CELL_TYPE_FORMULA ){
-		var formulaEvaluator = workbook.getCreationHelper().createFormulaEvaluator();
-		return this.getFormatter().formatCellValue( cell,formulaEvaluator );
-	}
-	if( cellType EQ cell.CELL_TYPE_BOOLEAN )
-		return cell.getBooleanCellValue();
- 	if( cellType EQ cell.CELL_TYPE_BLANK )
-		return "";
-	try{
-		return cell.getStringCellValue();
-	}
-	catch( any exception ){
-		return "";
-	}
-}
-
-private function getDateUtil(){
-	if( IsNull( variables.dateUtil ) )
-		variables.dateUtil = loadPoi( "org.apache.poi.ss.usermodel.DateUtil" );
-	return variables.dateUtil;
-}
-
-private string function getDateTimeValueFormat( required any value ){
-	/* Returns the default date mask for the given value: DATE (only), TIME (only) or TIMESTAMP */
-	var dateTime = ParseDateTime( value );
-	var dateOnly = CreateDate( Year( dateTime ),Month( dateTime ),Day( dateTime ) );
-	if( DateCompare( value,dateOnly,"s" ) EQ 0 )
-		return variables.dateFormats.DATE;
-	if( DateCompare( "1899-12-30",dateOnly,"d" ) EQ 0 )
-		return variables.dateFormats.TIME;
-	return variables.dateFormats.TIMESTAMP;
-}
-
-private numeric function getDefaultCharWidth( required workbook ){
-	/* Estimates the default character width using Excel's 'Normal' font */
-	/* this is a compromise between hard coding a default value and the more complex method of using an AttributedString and TextLayout */
-	var defaultFont = workbook.getFontAt( 0 );
-	var style = getAWTFontStyle( defaultFont );
-	var font = loadPOI( "java.awt.Font" );
-	var javaFont = font.init( defaultFont.getFontName(),style,defaultFont.getFontHeightInPoints() );
-	// this works
-	var transform = CreateObject( "java","java.awt.geom.AffineTransform" );
-	var fontContext = CreateObject( "java","java.awt.font.FontRenderContext" ).init( transform,true,true );
-	var bounds = javaFont.getStringBounds( "0",fontContext );
-	return bounds.getWidth();
-}
-
-private numeric function getFirstRowNum( required workbook ){
-	var firstRow = getActiveSheet( workbook ).getFirstRowNum();
-	if( firstRow EQ 0 AND getActiveSheet( workbook ).getPhysicalNumberOfRows() EQ 0 )
-		return -1;
-	return firstRow;
-}
-
-private function getFormatter(){
-	/* Returns cell formatting utility object ie org.apache.poi.ss.usermodel.DataFormatter */
-	if( IsNull( variables.dataFormatter ) )
-		variables.dataFormatter = this.loadPOI( "org.apache.poi.ss.usermodel.DataFormatter" ).init();
-	return dataFormatter;
-}
-
-private struct function getJavaColorRGB( required string colorName ){
-	/* Returns a struct containing RGB values from java.awt.Color for the color name passed in */
-	var findColor = colorName.Trim().UCase();
-	var color = CreateObject( "Java","java.awt.Color" );
-	if( IsNull( color[ findColor ] ) OR !IsInstanceOf( color[ findColor ],"java.awt.Color" ) )//don't use member functions on color
-		throw( type=exceptionType,message="Invalid color",detail="The color provided (#colorName#) is not valid." );
-	color = color[ findColor ];
-	var colorRGB = {
-		red = color.getRed()
-		,green = color.getGreen()
-		,blue = color.getBlue()
-	};
-	return colorRGB;
-}
-
-private numeric function getLastRowNum( required workbook ){
-	var lastRow = getActiveSheet( workbook ).getLastRowNum();
-	if( lastRow EQ 0 AND getActiveSheet( workbook ).getPhysicalNumberOfRows() EQ 0 )
-		return -1;//The sheet is empty. Return -1 instead of 0
-	return lastRow;
-}
-
-private numeric function getNextEmptyRow( workbook ){
-	return getLastRowNum( workbook )+1;
-}
-
-private array function getQueryColumnFormats( required workbook,required query query ){
-	/* extract the query columns and data types  */
-	//var cell	  	= CreateObject( "Java","org.apache.poi.ss.usermodel.Cell" );
-	var formatter	= workbook.getCreationHelper().createDataFormat();
-	var metadata 	= GetMetaData( query );
-	/* assign default formats based on the data type of each column */
-	for( var col in metadata ){
-		switch( col.typeName ){
-			/* apply basic formatting to dates and times for increased readability */
-			case "DATE": case "TIMESTAMP":
-				col.cellDataType = "DATE";
-				col.defaultCellStyle 	= this.buildCellStyle( workbook,{ dataFormat = variables.dateFormats[ col.typeName ] } );
-			break;
-			case "TIME":
-				col.cellDataType = "TIME";
-				col.defaultCellStyle 	= this.buildCellStyle( workbook,{ dataFormat = variables.dateFormats[ col.typeName ] } );
-			break;
-			/* Note: Excel only supports "double" for numbers. Casting very large DECIMIAL/NUMERIC or BIGINT values to double may result in a loss of precision or conversion to NEGATIVE_INFINITY / POSITIVE_INFINITY. */
-			case "DECIMAL": case "BIGINT": case "NUMERIC": case "DOUBLE": case "FLOAT": case "INTEGER": case "REAL": case "SMALLINT": case "TINYINT":
-				col.cellDataType = "DOUBLE";
-			break;
-			case "BOOLEAN": case "BIT":
-				col.cellDataType = "BOOLEAN";
-			break;
-			default:
-				col.cellDataType = "STRING";
-		}
-	}
-	return metadata;
-}
-
-private array function getRowData( required workbook,required row,array columnRanges=[] ){
-	var result=[];
-	if( !columnRanges.Len() ){
-		var columnRange={
-			startAt=1
-			,endAt=row.GetLastCellNum()
-		};
-		arguments.columnRanges=[ columnRange ];
-	}
-	for( var thisRange in columnRanges ){
-		for( var i=thisRange.startAt; i LTE thisRange.endAt; i++ ){
-			var colIndex=i-1;
-			var cell = row.GetCell( JavaCast( "int",colIndex ) );
-			if( IsNull( cell ) ){
-				result.Append( "" );
-				continue;
-			}
-			var cellValue = this.getCellValueAsType( workbook,cell );
-			result.Append( cellValue );
-		}
-	}
-	return result;
-}
-
-private numeric function getSheetIndexFromName( required workbook,required string sheetName ){
-	//returns -1 if non-existent
-	return workbook.getSheetIndex( JavaCast( "string",sheetName ) );
-}
-
-private function initializeCell( required workbook,required numeric rowNumber,required numeric columnNumber ){
-	var rowIndex = JavaCast( "int",rowNumber-1 );
-	var columnIndex = JavaCast( "int",columnNumber-1 );
-	var rowObject = getCellUtil().getRow( rowIndex,getActiveSheet( workbook ) );
-	var cellObject = getCellUtil().getCell( rowObject,columnIndex );
-	return cellObject; 
-}
-
-private boolean function isDateObject( required input ){
-	return input.getClass().getName() IS "java.util.Date";
-}
-
-private boolean function isString( required input ){
-	return input.getClass().getName() IS "java.lang.String";
-}
-
-private function loadPoi( required string javaclass ){
-	if( !server.KeyExists( poiLoaderName ) ){
-		var paths = [];
-		var libPath = ExpandPath( GetDirectoryFromPath( GetCurrentTemplatePath() ) & "lib/" );
-		paths.Append( libPath & "poi-3.12-20150511.jar" );
-		paths.Append( libPath & "poi-ooxml-3.12-20150511.jar" );
-		paths.Append( libPath & "poi-ooxml-schemas-3.12-20150511.jar" );
-		paths.Append( libPath & "xmlbeans-2.6.0.jar" );
-		if( !server.KeyExists( poiLoaderName ) ){
-			server[ poiLoaderName ] = CreateObject( "component","models.javaLoader.JavaLoader" ).init( loadPaths=paths,loadColdFusionClassPath=true,trustedSource=true );
-		}
-	}
-	return server[ poiLoaderName ].create( arguments.javaclass );
-}
-
-private void function moveSheet( required workbook,required string sheetName,required string moveToIndex ){
-	workbook.setSheetOrder( JavaCast( "String",sheetName ),JavaCast( "int",moveToIndex ) );
-}
-
-private array function parseRowData( required string line,required string delimiter,boolean handleEmbeddedCommas=true ){
-	var elements = ListToArray( arguments.line,arguments.delimiter );
-	var potentialQuotes = 0;
-	arguments.line = ToString( arguments.line );
-	if( arguments.delimiter EQ "," AND arguments.handleEmbeddedCommas )
-		potentialQuotes = arguments.line.replaceAll("[^']", "").length();		
-	if (potentialQuotes <= 1)
-	  return elements;
-	//For ACF compatibility, find any values enclosed in single quotes and treat them as a single element. 
-	var currentValue = 0;
-	var nextValue = "";
-	var isEmbeddedValue = false;
-	var values = [];
-	var buffer = CreateObject( "Java","java.lang.StringBuilder" ).init();
-	var maxElements = ArrayLen( elements );
-	
-	for( var i=1; i LTE maxElements; i++) {
-	  currentValue = Trim( elements[ i ] );
-	  nextValue = i < maxElements ? elements[ i + 1 ] : "";
-	  var isComplete = false;
-	  var hasLeadingQuote = currentValue.hasPrefix( "'" );
-	  var hasTrailingQuote = currentValue.hasSuffix( "'" );
-	  var isFinalElement = ( i==maxElements );
-	  if( hasLeadingQuote )
-		  isEmbeddedValue = true;
-	  if( isEmbeddedValue AND hasTrailingQuote )
-		  isComplete = true;
-	  /* We are finished with this value if:  
-		  * no quotes were found OR
-		  * it is the final value OR
-		  * the next value is embedded in quotes
-	  */
-	  if( !isEmbeddedValue || isFinalElement || nextValue.hasPrefix( "'" ) )
-		  isComplete = true;		  
-	  if( isEmbeddedValue || isComplete ){
-		  // if this a partial value, append the delimiter
-		  if( isEmbeddedValue AND buffer.length() GT 0 )
-			  buffer.append( "," ); 
-		  buffer.append( elements[i] );
-	  }
-	  if( isComplete ){
-		  var finalValue = buffer.toString();
-		  var startAt = finalValue.indexOf( "'" );
-		  var endAt = finalValue.lastIndexOf( "'" );
-		  if( isEmbeddedValue AND startAt GTE 0 AND endAt GT startAt )
-			  finalValue = finalValue.substring( startAt+1,endAt );
-		  values.add( finalValue );
-		  buffer.setLength( 0 );
-		  isEmbeddedValue = false;
-	  }	  
-  }
-  return values;
-}
-
-private string function queryToCsv( required query query,numeric headerRow,boolean includeHeaderRow ){
-	var result=[];
-	var crlf=Chr( 13 ) & Chr( 10 );
-	var columns=query.ColumnArray();
-	var hasHeaderRow=( arguments.KeyExists( "headerRow" ) AND Val( headerRow ) );
-	if( hasHeaderRow )
-		result.Append( generateCsvRow( columns ) );
-	for( var row in query ){
-		var rowValues=[];
-		for( column in columns ){
-			rowValues.Append( row[ column ] );
-		}
-		result.Append( generateCsvRow( rowValues ) );
-	}
-	return result.ToList( crlf );
-}
-
-private string function generateCsvRow( required array values,delimiter="," ){
-	var result=[];
-	for( var value in values ){
-		if( this.isDateObject( value ) ){
-			value= DateTimeFormat( value,dateFormats.DATETIME );
-		}
-		value=Replace( value,'"','""',"ALL" );//can't use member function in case its a non-string
-		result.Append( '"#value#"' );
-	}
-	return result.ToList( delimiter );
-}
-
-private string function queryToHtml( required query query,numeric headerRow,boolean includeHeaderRow ){
-	var result=[];
-	var columns=query.ColumnArray();
-	var hasHeaderRow=( arguments.KeyExists( "headerRow" ) AND Val( headerRow ) );
-	if( hasHeaderRow ){
-		result.Append( "<thead>" );
-		result.Append( generateHtmlRow( columns,true ) );
-		result.Append( "</thead>" );
-	}
-	result.Append( "<tbody>" );
-	for( var row in query ){
-		var rowValues=[];
-		for( column in columns ){
-			rowValues.Append( row[ column ] );
-		}
-		result.Append( generateHtmlRow( rowValues ) );
-	}
-	result.Append( "</tbody>" );
-	return result.ToList( "" );
-}
-
-private string function generateHtmlRow( required array values,boolean isHeader=false ){
-	var result=[ "<tr>" ];
-	var columnTag=isHeader? "th": "td";
-	for( var value in values ){
-		if( this.isDateObject( value ) ){
-			value= DateTimeFormat( value,dateFormats.DATETIME );
-		}
-		result.Append( "<#columnTag#>#value#</#columnTag#>" );
-	}
-	result.Append( "</tr>" );
-	return result.ToList( "" );
-}
-
-private boolean function rowIsEmpty( required row ){
-	for( var i=row.getFirstCellNum(); i LT row.getLastCellNum(); i++ ){
-    var cell = row.getCell( i );
-    if( !IsNull( cell ) && ( cell.getCellType() != cell.CELL_TYPE_BLANK ) )
-      return false;
-  }
-  return true;
-}
-
-private void function setCellValueAsType( required workbook,required cell,required value ){
-	if( IsNumeric( value ) AND !REFind( value,"^0[\d]+" ) ){ /*  skip numeric strings with leading zeroes. treat those as text  */
-		/*  NUMERIC  */
-		cell.setCellType( cell.CELL_TYPE_NUMERIC );
-		cell.setCellValue( JavaCast( "double",Val( value ) ) );
-		return;
-	}
-	if( IsDate( value ) ){
-		/*  DATE  */
-		var cellFormat = this.getDateTimeValueFormat( value );
-		cell.setCellStyle( this.buildCellStyle( workbook,{ dataFormat=cellFormat } ) );
-		cell.setCellType( cell.CELL_TYPE_NUMERIC );
-		/*  Excel's uses a different epoch than CF (1900-01-01 versus 1899-12-30). "Time" only values will not display properly without special handling - */
-		if( cellFormat EQ variables.dateFormats.TIME ){
-			var dateUtil = this.getDateUtil();
-			value = TimeFormat( value, "HH:MM:SS" );
-		 	cell.setCellValue( dateUtil.convertTime( value ) );
-		} else {
-			cell.setCellValue( ParseDateTime( value ) );
-		}
-		return;
-	}
-	if( IsBoolean( value ) ){
-		/* BOOLEAN */
-		cell.setCellType( cell.CELL_TYPE_BOOLEAN );
-		cell.setCellValue( JavaCast( "boolean",value ) );
-		return;
-	}
-	if( !value.Trim().Len() ){
-		/* EMPTY */
-		cell.setCellType( cell.CELL_TYPE_BLANK );
-		cell.setCellValue( "" );
-		return;
-	}
-	/* STRING */
-	cell.setCellType( cell.CELL_TYPE_STRING );
-	cell.setCellValue( JavaCast( "string",value ) );
-}
-
-private boolean function sheetExists( required workbook,string sheetName,numeric sheetNumber ){
-	validateSheetNameOrNumberWasProvided( argumentCollection=arguments );
-	if( arguments.KeyExists( "sheetName" ) )
-		arguments.sheetNumber = this.getSheetIndexFromName( workbook,sheetName )+1;
-		//the position is valid if it an integer between 1 and the total number of sheets in the workbook
-	if( sheetNumber AND ( sheetNumber EQ Round( sheetNumber ) ) AND ( sheetNumber LTE workbook.getNumberOfSheets() ) )
-		return true;
-	return false;
-}
-
-private boolean function sheetHasMergedRegions( required sheet ){
-	return ( sheet.getNumMergedRegions() GT 0 );
-}
-
-private query function sheetToQuery(
-	required workbook
-	,string sheetName
-	,numeric sheetNumber=1
-	,numeric headerRow
-	,boolean includeHeaderRow=false
-	,boolean includeBlankRows=false
-	,boolean fillMergedCellsWithVisibleValue=false
-	,string rows //range
-	,string columns //range
-	,string columnNames
-){
-	var sheet={
-		includeHeaderRow=includeHeaderRow
-		,hasHeaderRow=( arguments.KeyExists( "headerRow" ) AND Val( headerRow ) )
-		,includeBlankRows=includeBlankRows
-		,columnNames=[]
-		,columnRanges=[]
-		,totalColumnCount=0
-	};
-	sheet.headerRowIndex = sheet.hasHeaderRow? headerRow-1: -1;
-	if( arguments.KeyExists( "columns" ) ){
-		sheet.columnRanges=this.extractRanges( arguments.columns );
-		sheet.totalColumnCount=columnCountFromRanges( sheet.columnRanges );
-	}
-	if( arguments.KeyExists( "sheetName" ) ){
-		validateSheetExistsWithName( workbook,sheetName );
-		arguments.sheetNumber = getSheetIndexFromName( workbook,sheetName )+1;
-	}
-	sheet.object = workbook.GetSheetAt( JavaCast( "int",sheetNumber-1 ) );
-	if( fillMergedCellsWithVisibleValue )
-		this.fillMergedCellsWithVisibleValue( workbook,sheet.object );
-	sheet.data = [];
-	if( arguments.KeyExists( "rows" ) ){
-		var allRanges = this.extractRanges( arguments.rows );
-		for( var thisRange in allRanges ){
-			for( var rowNumber=thisRange.startAt; rowNumber LTE thisRange.endAt; rowNumber++ ){
-				var rowIndex=rowNumber-1;
-				this.addRowToSheetData( workbook,sheet,rowIndex );
-			}
-		}
-	} else {
-		var lastRowIndex = sheet.object.GetLastRowNum();// zero based
-		for( var rowIndex=0; rowIndex LTE lastRowIndex; rowIndex++ ){
-			this.addRowToSheetData( workbook,sheet,rowIndex );
-		}
-	}
-	//generate the query columns
-	if( arguments.KeyExists( "columnNames" ) AND arguments.columnNames.Len() ){
-		arguments.columnNames=arguments.columnNames.ListToArray();
-		for( var i=1; i LTE sheet.totalColumnCount; i++ ){
-			var columnName=columnNames[ i ]?: "column" & i; 
-			sheet.columnNames.Append( columnName );
-		}
-	} else if( sheet.hasHeaderRow ){
-		var headerRow=sheet.object.GetRow( JavaCast( "int",sheet.headerRowIndex ) );
-		var rowData=getRowData( workbook,headerRow,sheet.columnRanges );
-		var i=1;
-		for( var value in rowData ){
-			var columnName="column" & i;
-			if( this.isString( value ) AND value.Len() )
-				columnName=value;
-			sheet.columnNames.Append( columnName );
-			i++;
-		}
-	} else {
-		for( var i=1; i LTE sheet.totalColumnCount; i++ ){
-			sheet.columnNames.Append( "column" & i );
-		}
-	}
-	return QueryNew( sheet.columnNames,"",sheet.data );
-}
-
-private void function validateSheetExistsWithName( required workbook,required string sheetName ){
-	if( !this.sheetExists( workbook=workbook,sheetName=sheetName ) )
-		throw( type=exceptionType,message="Invalid sheet name [#sheetName#]", detail="The specified sheet was not found in the current workbook." );
-}
-
-private void function validateSheetNumber( required workbook,required numeric sheetNumber ){
-	if( !this.sheetExists( workbook=workbook,sheetNumber=sheetNumber ) ){
-		var sheetCount = workbook.getNumberOfSheets();
-		throw( type=exceptionType,message="Invalid sheet number [#sheetNumber#]",detail="The sheetNumber must a whole number between 1 and the total number of sheets in the workbook [#sheetCount#]" );
-	}
-}
-
-private void function validateSheetName( required string sheetName ){
-	var poiTool = loadPoi( "org.apache.poi.ss.util.WorkbookUtil" );
-	try{
-		poiTool.validateSheetName( JavaCast( "String",sheetName ) );
-	}
-	catch( "java.lang.IllegalArgumentException" exception ){
-		throw( type=exceptionType,message="Invalid characters in sheet name",detail=exception.message );
-	}
-}
-
-private void function validateSheetNameOrNumberWasProvided(){
-	if( !arguments.KeyExists( "sheetName" ) AND !arguments.KeyExists( "sheetNumber" ) )
-		throw( type=exceptionType,message="Missing Required Argument", detail="Either sheetName or sheetNumber must be provided" );
-	if( arguments.KeyExists( "sheetName" ) AND arguments.KeyExists( "sheetNumber" ) )
-		throw( type=exceptionType,message="Too Many Arguments", detail="Only one argument is allowed. Specify either a sheetName or sheetNumber, not both" );
-}
-
-private function workbookFromFile( required string path ){
-	// works with both xls and xlsx
-	try{
-		lock name="#path#" timeout=5{
-			var file = CreateObject( "java","java.io.FileInputStream" ).init( path );
-			var workbook = loadPoi( "org.apache.poi.ss.usermodel.WorkbookFactory" ).create( file );
-		}
-		return workbook;
-	}
-	finally{
-		file.close();
-	}
-}
-
-private struct function xmlInfo( required workbook ){
-	var documentProperties = workbook.getProperties().getExtendedProperties().getUnderlyingProperties();
-	var coreProperties = workbook.getProperties().getCoreProperties();
-	return {
-		author = coreProperties.getCreator()?:""
-		,category = coreProperties.getCategory()?:""
-		,comments = coreProperties.getDescription()?:""
-		,creationDate = coreProperties.getCreated()?:""
-		,lastEdited = coreProperties.getModified()?:""
-		,subject = coreProperties.getSubject()?:""
-		,title = coreProperties.getTitle()?:""
-		,lastAuthor = coreProperties.getUnderlyingProperties().getLastModifiedByProperty().getValue()?:""
-		,keywords = coreProperties.getKeywords()?:""
-		,lastSaved = ""// not available in xml
-		,manager = documentProperties.getManager()?:""
-		,company = documentProperties.getCompany()?:""
-	};
-}
-</cfscript>
\ No newline at end of file
diff --git a/models/UtilService.cfc b/models/UtilService.cfc
deleted file mode 100644
index 10c3b8c..0000000
--- a/models/UtilService.cfc
+++ /dev/null
@@ -1,19 +0,0 @@
-<cfcomponent singleton>
-
-  <cfset this.name = "UtilService" />
-
-  <cffunction name="init" access="public" output="false">
-    <cfreturn this />
-  </cffunction>
-
-  <cffunction name="_invoke" access="public" returntype="any" output="false">
-    <cfargument name="obj" type="any" required="true" hint="I am the component to call." />
-    <cfargument name="fn" type="string" required="true" hint="I am the function to call." />
-    <cfargument name="args" type="any" required="false" default="#structNew()#" hint="I am the argument collection to pass to the function." />
-    
-    <cfinvoke component="#arguments.obj#" method="#arguments.fn#" argumentcollection="#arguments.args#" returnvariable="local.return_variable" />
-
-    <cfreturn local.return_variable />
-  </cffunction>
-
-</cfcomponent>
\ No newline at end of file
diff --git a/models/VarScoper/license.txt b/models/VarScoper/license.txt
deleted file mode 100644
index f3f1e1d..0000000
--- a/models/VarScoper/license.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE 
-Copyright 2006 Mike Schierberl
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file
diff --git a/models/VarScoper/readme.txt b/models/VarScoper/readme.txt
deleted file mode 100644
index 90053d9..0000000
--- a/models/VarScoper/readme.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-LICENSE 
-Copyright 2006 Mike Schierberl
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-varScoper
-Project Homepage:
-http://www.schierberl.com/varscoper
-
-
-Installation Instructions:
-	Extract all files to a publicly accesible directory on your CFMX 6 or 7 server.  
-	Navigate to index.cfm or varscoper.cfm and enter the absolute or relative 
-	path to the template or directory that you would like to check. 
-
-History
-	-v1.3
-		-CF Builder Extension Support
-		-Recognizes var statements anywhere in a function (CF9)
-		-Issues (13,14,15,16,17,18,19,20,21,23,25,26,27,28,30,31,32) Fixed
-		-Open BD/Railo Supported
-		-CFScript comments parsed correctly
-	-v1.2
-		-Significant improvements to cfscript parsing engine
-		-Issues (6,7,8,9,10,11) fixed
-		-Ability to exclude files/folders using properties.xml (only when parsing a folder)
-		-Ability to identify tags with "multiple personalities" i.e. cffeed/cfprocparam that can have different behaviors for output variables based on params
-		-More agressive var scope checking (newly identified scenarios that were missed before)
-		-Addition of unit testing suite
-	-v1.12
-		-added new tags to the parsing engine
-		-added XML output support
-		-fixed some bugs related to directory parsing in CF6
-	-v1.1
-		-added support for cfscript
-	-v1.0
-		-initial release
-		-cf tag support
-		-Find unscoped variables created with a cfset within a cffunction
-		-Find unscoped variables created with cftags (cfloop, cfquery, etc)
-		-Report line numbers and link directly to the line in the file
-		-Output to screen or csv
-
-
-
-
-
-
-Features:
-	-Identifies unscoped variables within cffunctions
-	-can return line numbers of functions/variables
-
-Known Limitations:
-	
-	-(fixed 1.13) Returns false positive when variables are set within a comments block 
-	-(fixed 1.13) If you don't scope an argument value, and then reference that value it 
-	 will "technically" return a false positive...
-		<cfargument name="foo">
-		<cfset foo.foo2 = bar /> 
-	instead of...
-		<cfset arguments.foo.foo2 />
-
-Future TODOs:
-	-(fixed 1.13) create a library of all cf tags that can create variables
-	-(fixed 1.13) cfscript
-	-(fixed 1.13) ignore things in comments (May need to use lookbehind?  Not supported in CF as far as I know)
-	-Integration with cfeclipse
-
-How can I help?
-	-I need help extending the testCaseCFC file.  If you come across false positives (or negatives)
-	 within your code, please send me a snippet so I can add it to the testCaseCFC
-	-I need help finding all cftags that create variables (cfloop, cfquery, etc)
-	 I'm sure there are some corner cases out there, I'd like to compile a comprehensive list.
-	-Send all requests for help or suggestions to mike@schierberl.com
-
-
-
diff --git a/models/VarScoper/varScoper.cfc b/models/VarScoper/varScoper.cfc
deleted file mode 100644
index 5b1f47c..0000000
--- a/models/VarScoper/varScoper.cfc
+++ /dev/null
@@ -1,798 +0,0 @@
-<!--- 	varscoper.cfc
-	
-	This cfc takes a string argument and parses the string looking for any unscoped variables within a cffunction
-	
-	Author: Mike Schierberl 
-			mike@schierberl.com
-	
-
-	Features:
-		-cfset
-		-can return line numbers of functions/variables
-	
-	Future TODOs:
-		-create a library of all cf tags that can create variables
-		-ignore things in comments (May need to use lookbehind?  Not supported in CF
-		-automatically fix unscoped vars (potentially dangerous)
-		-relative paths
-		
-	Known Limitations:
-	
-		-Returns false positive when variables are set within a comments block
-
-		-If you don't scope an argument value, and then set that value it will return a false positive... May not be a bad idea to change the syntax though in this case
-			<cfargument name="foo">
-			<cfset foo.foo2 = bar /> instead of...
-			<cfset arguments.foo.foo2 />
-		
-		-Cfscript does not return line numbers
-
- --->
-
-<cfcomponent name="varscoper" 	hint="I am a component used to find improperly scoped variables within a cfc" >
-
-	<cfset variables.fileParseText 				= "" />
-	<cfset variables.varscoperStruct 			= structNew() />
-	<cfset variables.OrderedUnVarArray			= arrayNew(1) />
-	<cfset variables.tempUnscopedArray			= "" />
-	<cfset variables.currentFunctionLineCount	= 1 />
-	<cfset variables.currentLineCountPosition	= 1 />
-	<cfset variables.currentLineCountFuncPos	= 1 />
-	<cfset variables.currentFunctionName		= "" />
-	<cfset variables.ignoredScopes				= "super,variables,this,cgi,form,url,application,arguments,cfcatch,cgi,client,cookie,request,server,session" />
-	<cfset variables.showDuplicates				= false />
-	<cfset variables.showLineNumbers			= true />
-	<cfset variables.parseCFscript				= false />
-	
-	<cfset variables.tagTypes					= arrayNew(1) />
-	<cfset variables.cf9						= "true" />
-	<cfset variables.allFunctionsScanned		= arrayNew(1) />
-	
-	<cfif variables.cf9>
-		<cfset variables.ignoredScopes = listAppend(variables.ignoredScopes,"local") />
-	</cfif>
-	
-	<!--- Identify all tags that should be checked here... --->
-	<!--- These are key value pairs where the value is the parameter of the tag used to create a variable --->
-	<!--- attributes defs
-		attribute 1) tag name
-		attribute 2) tag attribute name that accepts the variables
-		
-		attribute 3) tag attribute name that tells the tag it is to accept a variable
-		attribute 4) tag attribute value (read, create, etc) that tells the tag it is to accept a variables (works in conjunction with attribute 3)
-	--->
-	<cfset arrayAppend(variables.tagTypes,"cfloop:index") />
-	<cfset arrayAppend(variables.tagTypes,"cfloop:item") />
-	<cfset arrayAppend(variables.tagTypes,"cfquery:name") />
-	<cfset arrayAppend(variables.tagTypes,"cfinvoke:returnvariable") />
-	<cfset arrayAppend(variables.tagTypes,"cfdirectory:name") />
-	<cfset arrayAppend(variables.tagTypes,"cffile:variable") />
-	<cfset arrayAppend(variables.tagTypes,"cfparam:name") />
-	<cfset arrayAppend(variables.tagTypes,"cfsavecontent:variable") />
-	<cfset arrayAppend(variables.tagTypes,"cfform:name") />
-	<cfset arrayAppend(variables.tagTypes,"cfstoredproc:name")>
-	<cfset arrayAppend(variables.tagTypes,"cfprocparam:variable:type:out")>
-	<cfset arrayAppend(variables.tagTypes,"cfhttp:result")>
-	<cfset arrayAppend(variables.tagTypes,"cfquery:result")>
-	<cfset arrayAppend(variables.tagTypes,"cfimage:name")>
-	<cfset arrayAppend(variables.tagTypes,"cfmail:query")>
-	<cfset arrayAppend(variables.tagTypes,"cffeed:name")>
-	<cfset arrayAppend(variables.tagTypes,"cffeed:query:action:read")>
-	<cfset arrayAppend(variables.tagTypes,"cfftp:name")>
-	<cfset arrayAppend(variables.tagTypes,"cfftp:result")>
-	<cfset arrayAppend(variables.tagTypes,"cfwddx:output")>
-	<cfset arrayAppend(variables.tagTypes,"cfobject:name")>
-	<cfset arrayAppend(variables.tagTypes,"cfsearch:name")>
-	<cfset arrayAppend(variables.tagTypes,"cfprocresult:name")>
-	<cfset arrayAppend(variables.tagTypes,"cfpop:name")>
-	<cfset arrayAppend(variables.tagTypes,"cfregistry:name")>
-	<cfset arrayAppend(variables.tagTypes,"cfreport:name")>
-	<cfset arrayAppend(variables.tagTypes,"cfdbinfo:name")>
-	<cfset arrayAppend(variables.tagTypes,"cfdocument:name")>
-	<cfset arrayAppend(variables.tagTypes,"cfexecute:variable")>
-	<cfset arrayAppend(variables.tagTypes,"cfNtAuthenticate:result")>
-	<cfset arrayAppend(variables.tagTypes,"cfcollection:name")>
-	<cfset arrayAppend(variables.tagTypes,"cfpdf:name")>
-	<cfset arrayAppend(variables.tagTypes,"cfxml:variable")>
-	<cfset arrayAppend(variables.tagTypes,"cfzip:name")>
-	<cfset arrayAppend(variables.tagTypes,"cfldap:name")>
-
-	
-	<cffunction name="init" access="public" output="false" 
-		hint="I initialize an instance of the var scoper component which is used to find unscoped vars" >
-		<cfargument name="fileParseText" required="true" type="string" 
-			hint="I am the string representing the code within a cfc that needs to be parsed" />
-		<cfargument name="showDuplicates" required="false" type="boolean"
-			hint="I specify if duplicate instances of variables should be shown, useful because first instance may be in comments" />
-		<cfargument name="showLineNumbers" required="false" type="boolean"
-			hint="I specify if line numbers should be logged, this adds on extra processing time" />
-		<cfargument name="parseCfscript" required="false" type="boolean"
-			hint="I specify if CFScript should be parsed">
-		
-		<cfif isDefined("arguments.showDuplicates")>
-			<cfset variables.showDuplicates = arguments.showDuplicates />
-		</cfif>
-		<cfif isDefined("arguments.showLineNumbers")>
-			<cfset variables.showLineNumbers = arguments.showLineNumbers />
-		</cfif>
-		<cfif isDefined("arguments.parseCFscript")>
-			<cfset variables.parseCFscript = arguments.parseCFscript />
-		</cfif>
-		<cfset variables.fileParseText = arguments.fileParseText />
-		
-		<cfreturn this>
-			
-	</cffunction>
-
-	<cffunction name="runVarscoper" access="public" output="false" returntype="void"
-		hint="I run the file parsing process and populate structs that represent scoped variables within the cfc being parsed">
-		<cfset var currentPositionInFile 		= 1 />
-		<cfset var functionREfind				= "" />
-		<cfset var functionInnerText			= "" />
-		<cfset var currentPositionVarFind		= 0 />
-		<cfset var functionNameRE				= "" />
-		<cfset var functionTagRE				= "" />
-		<cfset var functionName					= "" />
-		<cfset var varREFind					= "" />
-		<cfset var varVariableName				= "" />
-		<cfset var positionEndOfVarFind			= "" />
-		<cfset var variableREFind				= "" />
-		<cfset var tempVaredStruct				= "" />
-		<cfset var tempUnVaredStruct			= "" />
-		<cfset var RegExCFsetVar				= "<cfset+[\s]+var+[\s]+[a-zA-Z0-9_\[\]\.\s]+\=(.*?)\>" />
-		<cfset var RegExCffunction				= "<\s?cffunction\b[^>]*>(.*?)</\s?cffunction\s?>" />
-		<cfset var tempCurrentFunctionStruct	= "" />
-		<cfset var tagTypeIdx					= "" />
-		<cfset var findVarsResult				= "" />
-
-		
-		<!--- Use a RE to find text within the first cffunction, do this once here and once at the bottom of the loop so we can use a condition loop --->
-			<!--- only run if a comment is found --->
-			
-			<!--- Stripping out comments is going to take some more work --->
-			<!--- 			
-			<cfif Find("<! ---", fileParseText)>
-				<cfset variables.fileParseText = fileParseText.replaceAll("[^\r\n\t\-](?=[^\!]*\-\-\-)","") >
-			</cfif> --->
-			
-			<cfset functionREfind = ReFindNoCase(RegExCffunction,fileParseText,currentPositionInFile,true)>
-		
-			<!--- Keep looping over the file until we have found all functions --->
-			<cfloop condition="functionREfind.POS[1] NEQ 0">
-				<cftry>
-					<cfset functionTagRE = ReFindNoCase("<cffunction(.*?)\>",fileParseText,currentPositionInFile,true)>
-	
-					<cfif findNoCase("name",mid(fileParseText,functionTagRE.POS[1],functionTagRE.LEN[1])) GT 0>
-						<cfset functionNameRE = ReFindNoCase('name(\s?)+\=(\s?)["''][^"\r\n]*["'']',fileParseText,functionTagRE.POS[1],true) />
-					<cfelse>
-						<cfthrow type="functionWithoutName">
-					</cfif>
-	
-					<!--- Isolate the FunctionName for reference in the global struct --->
-					<cfset functionNameRE = ReFindNoCase('name(\s?)+\=(\s?)["''][^"\r\n]*["'']',fileParseText,functionTagRE.POS[1],true) />
-					<cfset functionName = mid(fileParseText,functionNameRE.POS[1],functionNameRE.LEN[1]) />
-					<!--- Remove the variable name --->
-					<cfset functionName = replaceNoCase(functionName,"name","")>
-					<!--- Remove all equals, single and double quotes to isolate the variable created --->
-					<cfset functionName = ReReplaceNoCase(functionName,'["''=]',"","all")>
-			
-					<cfset arrayAppend(variables.allFunctionsScanned,functionName) />
-					<cfset variables.currentFunctionName = functionName />
-					<cfset tempCurrentFunctionStruct = structNew() />
-					<cfset tempCurrentFunctionStruct.functionName = functionName />
-					
-					<cfset variables.currentFunctionLineCount = variables.currentFunctionLineCount + countNumberOfLines(stringToParse:mid(fileParseText,variables.currentLineCountPosition,functionREfind.POS[1]-variables.currentLineCountPosition)) />
-					<cfset tempCurrentFunctionStruct.lineNumber	= variables.currentFunctionLineCount />
-					<cfset variables.tempUnscopedArray = arrayNew(1) />
-					
-					<cfset variables.currentLineCountFuncPos = functionREfind.POS[1] />
-	
-					<!--- set functionInnerText to return a string of everything contained within the current function --->
-					<cfset functionInnerText = mid(fileParseText,functionREfind.POS[1],functionREfind.LEN[1])>
-					
-					<!--- Start parsing at position 1 within the current function string --->
-					<cfset currentPositionVarFind = 1>
-					
-					<cfset variables.varscoperStruct["#functionName#"] = structNew() />
-					<!--- Create a struct to identify all variables that have been correctly var-ed within this function --->
-					<cfset variables.varscoperStruct["#functionName#"].varedStruct = structNew() />
-					<cfset tempVaredStruct = variables.varscoperStruct["#functionName#"].varedStruct />
-	
-					<!--- Create another struct to identify variables that don't exist in the current functions var-ed variables --->
-					<cfset variables.varscoperStruct["#functionName#"].unVaredStruct = structNew() />
-					<cfset tempUnVaredStruct = variables.varscoperStruct["#functionName#"].unVaredStruct />
-					
-					<!--- findVars processes a string and returns a struct containing all variables set by vars as well as the line number of the end block for vars --->
-					<cfset findVarsResult = findVars(functionInnerText) />
-					
-					<cfset structAppend(variables.varscoperStruct["#functionName#"].VaredStruct,findVarsResult.variableNames) />
-					
-					<!--- Set the position that we ended looking for vars --->
-					<cfset positionEndOfVarFind = findVarsResult.endVarLine />
-					
-					<cfset findCFsetVariables(currentFunctionName:functionName,stringToParse=functionInnerText,positionToStart=positionEndOfVarFind) />
-					
-					<cfif variables.parseCFscript>
-						<cfset findCFscriptVariables(currentFunctionName:functionName,stringToParse=functionInnerText,positionToStart=positionEndOfVarFind) />
-					</cfif>
-					
-					<cfloop from="1" to="#arrayLen(variables.tagTypes)#" index="tagTypeIdx">
-
-						<cfset findVarsByTag(currentFunctionName:functionName,tagName:getToken(variables.tagTypes[tagTypeIdx],1,':'),variableName:getToken(variables.tagTypes[tagTypeIdx],2,':'),tagAcceptAttribute:getToken(variables.tagTypes[tagTypeIdx],3,':'),tagAcceptAttributeValue:getToken(variables.tagTypes[tagTypeIdx],4,':'),stringToParse=functionInnerText,positionToStart=positionEndOfVarFind) />
-						
-					</cfloop>
-					
-	
-					<!--- Done finding vars, lets append this to the array --->
-					<!--- Only add functions where we have unscoped vars --->
-					<cfif NOT arrayIsEmpty(variables.tempUnscopedArray) >
-						<cfset tempCurrentFunctionStruct.unScopedArray = variables.tempUnscopedArray />
-						<cfset arrayAppend(variables.OrderedUnVarArray,tempCurrentFunctionStruct) />
-					</cfif>
-	
-					<cfcatch type="functionWithoutName">
-					<!--- Found a function without a name, TODO: what to throw here? --->
-						<cfrethrow>
-					</cfcatch>
-				</cftry>
-				<cfset variables.currentLineCountPosition = functionREfind.POS[1] />
-				<cfset currentPositionInFile = functionREfind.POS[1] + functionREfind.LEN[1] />
-				<cfset functionREfind = ReFindNoCase(RegExCffunction,fileParseText,currentPositionInFile,true)>
-
-			</cfloop>
-		<!--- End looping over functions --->
-
-		
-	</cffunction>
-	
-	<cffunction name="findVars" output="false" returntype="struct"
-				hint="I process a string (generally a block within a function) and return a struct of variables set with var statements">
-		<cfargument name="stringToProcess" required="false" type="string">
-		
-		<cfset var RegExCFsetVar				= '<cfset+[\s]+var+([\s])+[a-zA-Z0-9_\[\"\''\]\##\.\s]+\=(.*?)\>' />
-		<cfset var currentPositionVarFind = 1 />
-		<cfset var returnStruct = structNew() />
-		<cfset var varVariableName = "" />
-		<cfset var tempVaredStruct = structNew() />
-		<cfset var varREFind	= "" />
-		<cfset var currentPositionVariableFind = "" />
-		<cfset var VariableNameCfset	= "" />
-		
-		<cfset var variableCFScriptDelim=" #chr(13)##chr(9)##chr(8)#">
-		<cfset var variableCFScriptStart = ""/>
-		<cfset var variableCFScriptEND = ""/>
-		<cfset var variableCFScriptText = ""/>
-		<cfset var variableCFScriptTextTmp = ""/>
-		<cfset var variableCFScriptCmd = ""/>
-		<cfset var variableCFcommentSTART = "" />
-		<cfset var variableCFcommentEND =""/>
-		
-		<!--- Loop over RegEx to find all variables that have been correctly var-ed within this cffunction --->
-		<cfset varREFind = ReFindNoCase(RegExCFsetVar,arguments.stringToProcess,currentPositionVarFind,true)>
-		<cfloop condition="varREFind.POS[1] NEQ 0">
-			<!--- set varVariableName to the cfset tag --->
-			<cfset varVariableName = mid(arguments.stringToProcess,varREFind.POS[1],varREFind.LEN[1])>
-			<!--- strip the cfset code to isolate the variable name --->
-			<cfset varVariableName = trim(reReplaceNoCase(left(varVariableName,find("=",varVariableName)-1),"<cfset+[\s]+var+[\s]",""))>
-			
-			<!--- if the variable a good variable name? --->
-			<cfif isGoodVariableName(varVariableName)>
-				<!--- add this variable to the var struct - we will set all variables to unused--->
-				<!--- may use this in the future to identify orphaned vars--->
-				<cfset tempVaredStruct["#varVariableName#"] = "unused">
-			</cfif>
-			
-			<!--- Update the current parsing position to continue from the end of the cfset --->
-			<cfset currentPositionVarFind = varREFind.POS[1] + varREFind.LEN[1]>
-
-			<cfset varREFind = ReFindNoCase(RegExCFsetVar,arguments.stringToProcess,currentPositionVarFind,true)>
-		</cfloop>
-		
-					
-		<!--- Now start looping over all cfscript statements to identify variables that are being set --->
-		
-		<cfset currentPositionVariableFind = 1 />
-		<cfif variables.parseCFscript>
-			<cfset variableCFScriptStart = FindNoCase("<CFS"&"CRIPT>",arguments.stringToProcess,currentPositionVariableFind)/>
-				
-				<cfloop condition="variableCFScriptStart NEQ 0">
-					<!--- Identify the cfscript statement --->
-					<cfset variableCFScriptEND = FindNoCase("</CFS"&"CRIPT>",arguments.stringToProcess, variableCFScriptStart+1)/>
-					
-					
-					<cfif variableCFScriptEND neq 0>
-						<cfset variableCFScriptText=""/>
-						
-						<cfset variableCFScriptTextTmp =mid(arguments.stringToProcess, variableCFScriptSTART + len('<cfs'&'cript>'), 
-									variableCFScriptEND-variableCFScriptSTART- len('<cfsc'&'ript>') )/>
-									
-						<!--- change to use unix style lines endings --->			
-						<cfset variableCFScriptTextTmp =Replace(variableCFScriptTextTmp,"#chr(13)##chr(10)#",chr(13),"ALL")/>
-				
-						<!--- clean script --->
-						<cfset variableCFScriptTextTmp = cleanScript(variableCFScriptTextTmp) />
-										
-						<cfloop index="variableCFScriptCmd" list="#variableCFScriptTextTmp#" delimiters=";">
-							<cfset variableCFScriptCmd=ListFirst(ListChangeDelims(variableCFScriptCmd," ",variableCFScriptDelim),"=")/>
-							<cfset variableCFScriptCmd=trim(variableCFScriptCmd)>
-							<cfif ListFirst(trim(variableCFScriptCmd), " ") eq "var">
-								<cfset VariableNameCfset=mid(variableCFScriptCmd,3,len(variableCFScriptCmd))/>
-								<cfset VariableNameCfset=trim(ListGetAt(variableCFScriptCmd,2, " "))/>
-								<!--- Update the var-ed struct to note that we are using this var --->
-								<cfset tempVaredStruct["#VariableNameCfset#"] = "not used">
-							</cfif>
-						</cfloop>
-						<!--- Update the current parsing position to start from the end of the cfset statement --->
-						<cfset currentPositionVariableFind = variableCFScriptEND>
-						<cfset variableCFScriptStart = FindNoCase("<CFS"&"CRIPT>",arguments.stringToProcess,currentPositionVariableFind)>
-					<cfelse>	
-						<cfset variableCFScriptStart=variableCFScriptStart+len("<CFS"&"CRIPT>")>
-					</cfif>
-				</cfloop>
-		
-			
-			<cfset currentPositionVariableFind = variableCFScriptEND />
-	
-		</cfif>
-		
-		<cfif currentPositionVarFind GT currentPositionVariableFind>
-			<cfset returnStruct.endVarLine = currentPositionVarFind>
-		<cfelse>
-			<cfset returnStruct.endVarLine = currentPositionVariableFind>
-		</cfif>
-		
-		<!---TODO: if CF9 also look for "LOCAL" scoped variables in cfsets and cfscript
-		<cfif ColdFusion9>
-			
-		</cfif>
-		--->
-
-		
-		<!---TODO: endVarLine is no longer valid as vars can appear anywhere in CF9 --->
-		<cfset returnStruct.endVarLine = currentPositionVarFind>		
-		<cfset returnStruct.variableNames = tempVaredStruct />
-
-		<cfif variables.cf9>
-			<cfset returnStruct.endVarLine = 1 />
-		</cfif>
-		
-		<cfreturn returnStruct>
-	</cffunction>
-	
-	
-	<cffunction name="findCFsetVariables" output="false" returntype="void"
-		hint="I scope the function and process all variables that were created with a cfset">
-			<cfargument name="stringToParse" type="string" hint="I am the block of text that will be parsed to find unscoped vars">
-			<cfargument name="positionToStart" type="numeric" hint="I am the starting position, this is generally right after the var-ed variables">
-			<cfargument name="currentFunctionName" type="string" hint="I am the name of the current function that is being parsed" >
-			
-			<cfset var REcfset = '<cfset+[\s]+[a-zA-Z0-9_\[\"\''\]\##\.\s\(\)]+\=(.*?)\>' />
-			
-			<cfset var variableREFind = "" />
-
-			<cfset var VariableNameCfset = "" /> 
-			<cfset var VariableNameCfsetIsolate="" /> 
-
-			<cfset var currentPositionVariableFind = arguments.positionToStart />
-			<cfset var functionInnerText = arguments.stringToParse />
-			<cfset var tempVaredStruct = variables.varscoperStruct["#arguments.currentFunctionName#"].varedStruct />
-			<cfset var tempUnVaredStruct = variables.varscoperStruct["#arguments.currentFunctionName#"].unVaredStruct />
-						
-			<!--- Now start looping over all cfset statements to identify variables that are being set --->
-			<cfset variableREFind = ReFindNoCase(REcfset,functionInnerText,currentPositionVariableFind,true)>
-			<cfloop condition="variableREFind.POS[1] NEQ 0">
-				<!--- Identify the cfset statement --->
-				<cfset VariableNameCfset = mid(functionInnerText,variableREFind.POS[1],variableREFind.LEN[1])>
-				<!--- Isolate the name of the variable being set --->
-				<cfset VariableNameCfsetIsolate = trim(ReReplaceNoCase(left(VariableNameCfset,find("=",VariableNameCfset)-1),"<cfset+[\s]",""))>
-				
-				<!--- Check to see if this is properly scoped already, make sure to check dot and array notation --->
-				<cfset VariableNameCfsetIsolate = ListFirst(ListFirst(VariableNameCfsetIsolate,'.'),'[') />
-				
-				<!--- string leading and trailing quotes and pounds --->
-				<cfset VariableNameCfsetIsolate = stripLeadingAndTrailingQuotesAndPoundsFromVariableName(VariableNameCfsetIsolate) />
-				
-				<!--- TODO: this is a bit of a hack to account for vars appearing anywhere in the function in CF9 --->
-				<cfif variables.cf9 AND refindNoCase("var+[\s]",VariableNameCfsetIsolate)>
-					<cfset VariableNameCfsetIsolate = ReReplaceNoCase(VariableNameCfsetIsolate,"var+[\s]","") />
-				</cfif>
-				
-				<!--- if the variable a good variable name? --->
-				<cfif isGoodVariableName(VariableNameCfsetIsolate)>
-					<cfif structKeyExists(tempVaredStruct,"#VariableNameCfsetIsolate#")>
-						<!--- Update the var-ed struct to note that we are using this var --->
-						<cfset tempVaredStruct["#VariableNameCfsetIsolate#"] = "used">
-					<cfelse>
-						<!--- Log the unvared struct, just the root, before dot or array notation --->
-						<cfset addToUnVarArray(variableName:"#ListFirst(ListFirst(VariableNameCfsetIsolate,'['),'.')#",VariableContext:VariableNAmeCfSet,textPositionInFunction:variableREFind.POS[1]) />
-						<cfset tempUnvaredStruct["#ListFirst(ListFirst(VariableNameCfsetIsolate,'['),'.')#"] = VariableNameCfset />
-					</cfif>
-				</cfif>
-				
-				<!--- Update the current parsing position to start from the end of the cfset statement --->
-				<cfset currentPositionVariableFind = variableREFind.POS[1] + variableREFind.LEN[1]>
-				<cfset variableREFind = ReFindNoCase(REcfset,functionInnerText,currentPositionVariableFind,true)>
-			</cfloop>
-		
-	</cffunction>
-	
-	
-	<cffunction name="findCFscriptVariables" output="false" returntype="void"
-		hint="I scope the function and process all variables that were created within a cfscript block">
-			<cfargument name="stringToParse" type="string" hint="I am the block of text that will be parsed to find unscoped vars">
-			<cfargument name="positionToStart" type="numeric" hint="I am the starting position, this is generally right after the var-ed variables">
-			<cfargument name="currentFunctionName" type="string" hint="I am the name of the current function that is being parsed" >
-			
-			<cfset var REcfscript = "<\s?cfscript\b[^>]*>(.*?)</\s?cfscript\s?>" />
-			
-			<cfset var currentPositionVariableFind = arguments.positionToStart />
-			<cfset var functionInnerText = arguments.stringToParse />
-			<cfset var tempVaredStruct = variables.varscoperStruct["#arguments.currentFunctionName#"].varedStruct />
-			<cfset var tempUnVaredStruct = variables.varscoperStruct["#arguments.currentFunctionName#"].unVaredStruct />
-			<cfset var cfscriptArray = ""/>
-			<cfset var setStatementArray = ""/>
-			<cfset var variableNameSetIsolate = ""/>
-			<cfset var cfscriptIdx = ""/>
-			<cfset var setStatementIdx = ""/>
-			
-			<!--- cfscript array is an array of all cfscript blocks --->
-			<cfset cfscriptArray = ReParserLoop(textToParse:functionInnerText,RegularExpression:REcfscript) />
-
-			<cfloop from="1" to="#arrayLen(cfscriptArray)#" index="cfscriptIdx">
-				
-				<!--- clean script --->
-				<cfset cfscriptArray[cfscriptIdx].TEXT = cleanScript(cfscriptArray[cfscriptIdx].TEXT) />
-				
-				<cfset setStatementArray = ReParserLoop(textToParse:cfscriptArray[cfscriptIdx].TEXT,RegularExpression:'[a-zA-Z0-9_\[\"\''\]\-\(\)\##\.\+\s]*?\=[\w\D]*?;(\s.*?)')>				
-				
-				<!--- Loop over all potential set statements --->
-				<cfloop from="1" to="#arrayLen(setStatementArray)#" index="setStatementIdx">
-					<!--- Script block could contain var and non-var statements, ignore the vars --->
-					<cfif ReFindNoCase("[\s]+var+[\s]",setStatementArray[setStatementIdx].TEXT) EQ 0>
-	
-						<!--- Strip out else statements if they are first.  Else is reserved word in cfscript and you could have a situation where you have if(variable) foo=1;else bar=1; --->
-						<cfset variableNameSetIsolate = setStatementArray[setStatementIdx].TEXT.replaceAll("else+[\s]","")>
-						
-						<!--- make sure we have a variable to parse --->
-						<cfif find("=",variableNameSetIsolate)-1 GT 0>
-						
-							<!--- Check to see if this is properly scoped already, make sure to check dot and array notation --->
-							<cfset variableNameSetIsolate = left(variableNameSetIsolate,find("=",variableNameSetIsolate)-1) />
-							<cfset VariableNamesetIsolate = trim(ListFirst(ListFirst(VariableNamesetIsolate,'.'),'[')) />
-							
-							<!--- string leading and trailing quotes and pounds --->
-							<cfset VariableNamesetIsolate = stripLeadingAndTrailingQuotesAndPoundsFromVariableName(VariableNamesetIsolate) />
-	
-							<!--- if the variable a good variable name? --->
-							<cfif isGoodVariableName(VariableNamesetIsolate)>
-								<cfif structKeyExists(tempVaredStruct,"#VariableNamesetIsolate#")>
-									<!--- Update the var-ed struct to note that we are using this var --->
-									<cfset tempVaredStruct["#VariableNamesetIsolate#"] = "used">
-								<cfelse>
-									<!--- Log the unvared struct, just the root, before dot or array notation --->
-									<cfset addToUnVarArray(variableName:"#VariableNamesetIsolate#",VariableContext:setStatementArray[setStatementIdx].TEXT,textPositionInFunction:cfScriptArray[cfscriptIdx].POS+setStatementArray[setStatementIdx].POS+setStatementArray[setStatementIdx].LEN) />
-									<cfset tempUnvaredStruct["#VariableNamesetIsolate#"] = setStatementArray[setStatementIdx] />
-							
-								</cfif>
-							</cfif>
-						</cfif>
-					</cfif>
-				</cfloop>
-				
-			</cfloop>
-
-	</cffunction>
-	
-	
-	<cffunction name="findVarsByTag" output="false" 
-		hint="I scope for tags that can create variables, (cfquery, cffile, etc)">
-		<cfargument name="tagName" type="string" hint="I am the name of the tag">
-		<cfargument name="variableName" type="string" hint="I am the name of the variable that needs to be checked in this tag">
-		<cfargument name="tagAcceptAttribute" type="string" hint="I hold the possibly tag attribute that allows the tag to accept a variable (example: action='read' for cffeed)">
-		<cfargument name="tagAcceptAttributeValue" type="string" hint="I hold the value that the tagAcceptAttribute uses to allow the tag to accept a variable">
-		<cfargument name="stringToParse" type="string" hint="I am the block of text that will be parsed to find unscoped vars">
-		<cfargument name="positionToStart" type="numeric" hint="I am the starting position, this is generally right after the var-ed variables">
-		<cfargument name="currentFunctionName" type="string" hint="I am the name of the current function that is being parsed" >
-		
-		<cfset var currentPositionLoopFind = 0 />
-		<cfset var loopREFind = "" />
-		<cfset var functionInnerText = "" />
-		<cfset var tagIsolationString = "" />
-		<cfset var findVariableRE = "" />
-		<cfset var variableNameIsolationString = "" />
-		<cfset var tagNameRegEx = "<#arguments.tagName# +[a-zA-Z0-9\.\s]+\=(.*?)\>" />
-		
-		<cfset functionInnerText = arguments.stringToParse />
-		<cfset currentPositionLoopFind = arguments.positionToStart />
-		
-		<!--- Find the first instance of this combo of tag/variable name --->
-		<cfset loopREFind = ReFindNoCase(tagNameRegEx,functionInnerText,currentPositionLoopFind,true) />
-	
-			<!--- Loop as long as we find more instances of this tag --->
-			<cfloop condition="loopREFind.POS[1] NEQ 0">
-				<cftry>					
-						<!--- Isolate this tag --->
-						<!--- Remove all RT, NL and TABS to help with variable debug display --->
-						<cfset tagIsolationString = ReReplaceNoCase(mid(functionInnerText,loopREFind.POS[1],loopREFind.LEN[1]), "[\r\n\t]", " ", "ALL") />
-	
-						<!--- Use a RE to find instance of the variable name statement --->
-						<!--- This will find the variable name, then a value following the equals sign enclosed in single or double quotes --->
-											
-						<cfset findVariableRE = ReFindNoCase('(\s)#arguments.variableName#(\s?)\=(\s?)*(["'']?)[^"^''\r\n\s]*(["'']?)',tagIsolationString,1,true) />
-						
-						<!--- Flow
-							1. Check to see if the tag:variable (attributes 1 & 2 within tagTypes array) attributes was found
-							2a. Make sure tagAcceptAttribute is not empty
-							2b. Make sure tagAcceptAttributeValue is not empty
-							2c. Check to see if the tag has the proper tag action to accept a variable (attributes 3 & 4 within tagTypes array. 
-							    If found then mark as a valid tag that can accept a variable and continue the varScoper check otherwise flag it as a tag that CREATES a variable (which does not need to be scoped)
-						--->
-						
-								
-						
-						<cfif findVariableRE.POS[1] EQ 0 
-							OR 
-								(
-									arguments.tagAcceptAttribute IS NOT ""
-									AND
-									arguments.tagAcceptAttributeValue IS NOT ""
-									AND
-									NOT REFindNoCase('(\s)#arguments.tagAcceptAttribute#(\s?)\=(\s?)(["'']?)#arguments.tagAcceptAttributeValue#(["'']?)',tagIsolationString,1)
-								)
-							>
-							<!--- NOTE: I was throwing an exception here, but it was annoying seeing so many in the debug output --->
-							<!--- <cfthrow type="unknownVariableType" > --->
-							<!--- message="#arguments.variableName# does not exist within #arguments.tagName#" --->
-						
-						<cfelse>
-							<!--- isolate the string that encloses this variable --->
-							<cfset variableNameIsolationString = mid(TagIsolationString,findVariableRE.POS[1],findVariableRE.LEN[1])>
-							<!--- Remove the variable name --->
-							<cfset variableNameIsolationString = replaceNoCase(variableNameIsolationString,"#arguments.variableName#","")>
-							<!--- Remove all equals, single and double quotes to isolate the variable created --->
-							<cfset variableNameIsolationString = trim(ReReplaceNoCase(variableNameIsolationString,'["''=]',"","all"))>
-		
-							<!--- TODO: does this work specifyin multiple delimiters in one function call --->
-							<cfset variableNameIsolationString = ListFirst(ListFirst(variableNameIsolationString,'['),'.')>
-							
-							<!--- string leading and trailing quotes and pounds --->
-							<cfset variableNameIsolationString = stripLeadingAndTrailingQuotesAndPoundsFromVariableName(variableNameIsolationString) >
-						
-							<!--- Check to see if this is properly scoped already, make sure to check dot and array notation --->
-							<cfif structKeyExists(variables.varscoperStruct["#arguments.currentFunctionName#"].varedStruct,"#variableNameIsolationString#")>
-								<!--- Update the var-ed struct to note that we are using this var --->
-								<cfset variables.varscoperStruct["#arguments.currentFunctionName#"].varedStruct["#variableNameIsolationString#"] = "used">
-							
-							<!--- Removed this code because it is handled abovewith the double listFirst --->
-							<!---<cfelseif structKeyExists(variables.varscoperStruct["#arguments.currentFunctionName#"].varedStruct,"#ListFirst(variableNameIsolationString,'[')#")>
-								<!--- May exist in array notation --->
-								<!--- Not sure if this is even a valid case??  --->
-								<cfset variables.varscoperStruct["#arguments.currentFunctionName#"].varedStruct["#ListFirst(variableNameIsolationString,'[')#"] = "used">
-							<cfelseif structKeyExists(variables.varscoperStruct["#arguments.currentFunctionName#"].varedStruct,"#ListFirst(variableNameIsolationString,'.')#")>
-								<!--- May exist in dot notation --->
-								<cfset variables.varscoperStruct["#arguments.currentFunctionName#"].varedStruct["#ListFirst(variableNameIsolationString,'.')#"] = "used">  --->							
-							
-							<cfelse>
-								<!--- Var doesn't EXIST!!! this may be bad, lets track it --->
-					
-								<cfset addToUnVarArray(variableName:variableNameIsolationString,VariableContext:tagIsolationString,textPositionInFunction:loopREFind.POS[1]) />
-								<cfset variables.varscoperStruct["#arguments.currentFunctionName#"].unvaredStruct["#variableNameIsolationString#"] = tagIsolationString>
-							</cfif>
-						</cfif>
-					<cfcatch type="unknownVariableType">
-						<!--- We found a tag that exists without creating the given variable name i.e. looping over condition or query--->
-						<!--- Exit Gracefully and continue to next loop --->
-					</cfcatch>
-					<cfcatch type="any">
-						<cfrethrow>
-					</cfcatch>
-				</cftry>
-				<!--- Find the next cfloop --->
-				<cfset currentPositionLoopFind = loopREFind.POS[1] + loopREFind.LEN[1] />
-				<cfset loopREFind = ReFindNoCase(tagNameRegEx,functionInnerText,currentPositionLoopFind,true) />
-			</cfloop>
-		
-	</cffunction>
-	
-	<cffunction name="addToUnVarArray" access="private" output="false" returntype="void"
-		hint="I add the found unVared variable to an array for the current function">
-		
-		<cfargument name="variableName" type="string" required="true" hint="I am the name of the unscoped variable">
-		<cfargument name="variableContext" type="string" required="true" hint="I am the string representing the tag that the variable was eclosed in">
-		<cfargument name="textPositionInFunction" type="numeric" required="false" hint="I am the character position where we found this variable, used to find line position" />
-		<cfset var tempUnscopedStruct = structNew() />
-		<cfset var foundLineNumber = 0 />
-		
-		<cfif listFindNoCase(variables.ignoredScopes,arguments.variableName) EQ 0>
-			<cfif NOT structKeyExists(variables.varscoperStruct[variables.currentFunctionName].unVaredStruct,arguments.variableName) OR variables.showDuplicates>
-				<cfset tempUnscopedStruct.variableName = arguments.variableName />
-				<cfset tempUnscopedStruct.variableContext = arguments.variableContext />
-				<!--- If a text position in the function is passed we can count number of lines from the beginning of the function to return line numbers --->
-				<cfif isDefined("arguments.textPositionInFunction")>
-					<cfset foundLineNumber = variables.currentFunctionLineCount	+ countNumberOfLines(stringToParse:mid(variables.fileParseText,variables.currentLineCountFuncPos,textPositionInFunction)) />
-					<cfset tempUnscopedStruct.lineNumber = foundLineNumber />
-				</cfif>
-				
-				<cfset arrayAppend(variables.tempUnscopedArray, tempUnscopedStruct) />
-			</cfif>
-		</cfif>
-	</cffunction>
-	
-	<cffunction name="countNumberOfLines" access="private" output="false" returntype="numeric"
-		hint="I return the number of line breaks that appear in the given string">
-	
-		<cfargument name="stringToParse" type="string" required="true" hint="I am the string that will be parsed">
-		
-		<cfset var hasMoreLines = true />
-		<cfset var lineCheckLine = 1 />
-		<cfset var totalLines = 0 />
-		<cfset var lineFeedArray = "" />
-
-		<cfif variables.showLineNumbers>
-			<cfloop condition="hasMoreLines EQ true">
-				<!--- Make chr(13) optional, found some cases where we only had chr(10) --->
-				<cfset lineFeedArray = REFind("#chr(13)#?#chr(10)#",arguments.stringToParse,lineCheckLine,true) />
-				<cfif lineFeedArray.POS[1] EQ 0>
-					<cfset hasMoreLines = false />
-				<cfelse>
-					<cfset totalLines = totalLines + 1 />
-					<cfset lineCheckLine = lineFeedArray.POS[1] + lineFeedArray.LEN[1] />
-				</cfif>
-			</cfloop>
-			
-			<cfreturn totalLines />	
-		<cfelse>
-			<cfreturn 0 />
-		</cfif>
-
-	</cffunction>
-	
-	<cffunction name="ReParserLoop" access="public" output="false" returntype="array"
-		hint="I take a string and a regular expression, parse it and return an array of strings that match the RE">
-		
-		<cfargument name="textToParse" required="true" type="string" hint="I am the text that should be parsed">
-		<cfargument name="regularExpression" required="true" type="string" hint="I am the regular expression that should be used to parse">
-		<cfargument name="positionToStart" required="false" type="numeric" default="1" hint="I am the position that parsing should start at">
-		
-		<cfset var returnArray = arrayNew(1) />
-		<cfset var returnStruct = structNew() />
-		<cfset var currentPositionVariableFind = arguments.positionToStart />
-		<cfset var variableREFind = "" />
-		
-		<!--- Now start looping over all cfset statements to identify variables that are being set --->
-		<cfset variableREFind = ReFindNoCase(arguments.regularExpression,arguments.textToParse,currentPositionVariableFind,true)>
-			
-		<cfloop condition="variableREFind.POS[1] NEQ 0">
-	
-			<!--- reset struct --->
-			<cfset returnStruct = structNew() />
-			
-			<!--- text and position --->
-			<cfset returnStruct.TEXT = mid(arguments.textToParse,variableREFind.POS[1],variableREFind.LEN[1]) />
-			<cfset returnStruct.POS = variableREFind.POS[1] />
-			<cfset returnStruct.LEN = variableREFind.LEN[1] />
-			
-			<cfset arrayAppend(returnArray,returnStruct ) />
-	
-			<!--- Update the current parsing position to start from the end of the regular Expression --->
-			<cfset currentPositionVariableFind = variableREFind.POS[1] + variableREFind.LEN[1]>
-			<cfset variableREFind = ReFindNoCase(arguments.regularExpression,arguments.textToParse,currentPositionVariableFind,true)>
-		</cfloop>
-	
-		<cfreturn returnArray>
-	</cffunction>
-	
-	<cffunction name="isGoodVariableName" access="public" output="false" returntype="boolean"
-		hint="I check to see if this is a good variable name">
-		<cfargument name="variableName" type="string" required="true" />
-		
-		<cfset var REBadVariableChars = "[\;\(]" />
-		
-		<cfif REFindNoCase(REBadVariableChars, arguments.variableName, 1)>
-			<cfreturn false />	
-		</cfif>
-		<cfreturn true />
-		
-	</cffunction>
-	
-	<cffunction name="stripLeadingAndTrailingQuotesAndPoundsFromVariableName" access="public" output="false" returntype="string">
-		<cfargument name="variableName" type="string" required="true" />
-		
-		<cfset var variableNameIsolationString = arguments.variableName />
-		<cfset var hasPoundAsFirstChar = false />
-		
-		<!--- clear out before and after "'s --->
-		<!--- this catch is here for variables that are set like so "test.go#1#", which will remove the "'s from the variable --->
-		<!--- let's check the left side first --->
-
-		<cfif len(variableNameIsolationString) NEQ 1>
-			<cfif left(variableNameIsolationString, 1) EQ '"'>
-				<cfset variableNameIsolationString = right(variableNameIsolationString, len(variableNameIsolationString)-1) />
-			</cfif>
-	
-			<!--- let's now work on the right --->
-			<cfif right(variableNameIsolationString, 1) IS '"' >
-				<cfset variableNameIsolationString = left(variableNameIsolationString, len(variableNameIsolationString)-1) />
-			</cfif>
-			
-			<!--- clear out before and after #'s --->
-			<!--- this catch is here for tags that can accept variables to help dictate their return variable name --->
-			<!--- let's check the left side first --->
-			<cfif left(variableNameIsolationString, 1) EQ "##"  >
-				<cfset variableNameIsolationString = right(variableNameIsolationString, len(variableNameIsolationString)-1) />
-				<!--- if there is a pound the beginning of the variable then we want to strip the one at the end --->
-				<!--- set variable to true so we can do this later ---> 
-				<cfset hasPoundAsFirstChar = true />
-			</cfif>
-			<!--- let's now work on the right --->
-			<!--- only strip off the pound if there was one at the beginning of the variable --->
-			<cfif right(variableNameIsolationString, 1) IS "##" AND hasPoundAsFirstChar>
-				<cfset variableNameIsolationString = left(variableNameIsolationString, len(variableNameIsolationString)-1) />
-			</cfif>
-		</cfif>
-		
-		<cfreturn variableNameIsolationString />
-	
-	</cffunction>
-	
-	<cffunction name="cleanScript" access="public" output="false" returntype="string"
-		hint="I clean out script that could be within the string that could cause variable parsing issues">
-		<cfargument name="textToClean" required="true" type="string" hint="I am the string that is going to be cleaned" />
-		
-		<cfset var text = arguments.textToClean />
-		
-		<!--- <cfset text = text.ReplaceAll("(<\s?cfscript\b[^>]*>|</\s?cfscript\s?>)","")> --->
-		
-		<!--- strip comments --->
-		<cfset text = text.ReplaceAll("//(.*?)(?<!\)\;)#chr(13)#?#chr(10)#","") />
-		
-		<!--- This is a rockstar regex --->
-		<cfset text = rereplaceNoCase(text,'(/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/)','','all')/> 		
-		<!--- strip out /* type comments */ --->
-		<!---<cfset text = text.ReplaceAll("(?<!/)[^\r\n\s](?=[^/*]*\*/\s)","") />
-		<!--- regex above strips between comments, but doesn't erase them --->
-		<cfset text = replace(text,"/*","","all") />
-		<cfset text = replace(text,"*/","","all") />--->
-		
-		<!--- strip out if statements ($custom change:hkl)
-					quick and dirty, used for cases like
-						if() x = y;
-				 --->		
-		<cfset text = REReplaceNoCase(text,"if[ ]*\(+(.*?)\)+[\s\{]*?[#chr(13)#?#chr(10)#]","","all")>
-
-		<!--- Strip out for loops at start of statement, this is needed after Harry's fixes: ms --->
-		<cfset text = text.ReplaceAll("for\s?\(","")>
-		
-		<!--- strip out variable sets within function calls ($custom:hkl)
-			quick and dirty, used for cases like
-				method(a=x, b=y);
-		 --->
-		<cfset text = text.ReplaceAll("\((.*?)\)","")>
-                             
-		<!--- strip out bracket statements ($custom:hkl)
-			quick and dirty, used for cases like
-				stTest["mykey"] = value;
-		 --->
-		<!--- remove all returns --->
-		<cfset text = REReplaceNoCase(text,"[\;\>]+\s*return\s(.*?)+;","","all")>
-		
-		<cfreturn text />
-	</cffunction>
-	
-	<cffunction name="getResultsStruct" access="public" output="false" returntype="struct" 
-		hint="I return the results of scraping the vars in a struct">
-		
-		<cfreturn variables.varscoperStruct />
-	</cffunction>
-	
-	<cffunction name="getResultsArray" access="public" output="false" returntype="array"
-		hint="I am an ordered array of all the results that were found">
-		<cfreturn variables.OrderedUnVarArray />
-	</cffunction>
-	
-	<cffunction name="getAllFunctionsScanned" access="public" output="false" returntype="Array"
-		hint="Returns an array of all functions that were processed">
-		<cfreturn variables.allFunctionsScanned />	
-	</cffunction>
-	
-</cfcomponent>
\ No newline at end of file
diff --git a/models/javaLoader/JavaCompiler.cfc b/models/javaLoader/JavaCompiler.cfc
deleted file mode 100644
index 9f4f172..0000000
--- a/models/javaLoader/JavaCompiler.cfc
+++ /dev/null
@@ -1,178 +0,0 @@
-<cfcomponent hint="Compiles Java source dirs to an array of .jar files." output="false">
-
-<!------------------------------------------- PUBLIC ------------------------------------------->
-
-<cffunction name="init" hint="Constructor" access="public" returntype="JavaCompiler" output="false">
-	<cfargument name="jarDirectory" hint="the directory to build the .jar file in, defaults to ./tmp" type="string" required="No" default="#getDirectoryFromPath(getMetadata(this).path)#/tmp">
-	<cfscript>
-		var data = {};
-		var defaultCompiler = "com.sun.tools.javac.api.JavacTool";
-
-		//we have to manually go looking for the compiler
-
-		try
-		{
-			data.compiler = getPageContext().getClass().getClassLoader().loadClass(defaultCompiler).newInstance();
-		}
-		catch(any exc)
-		{
-			println("Error loading compiler:");
-			println(exc.toString());
-		}
-
-		/*
-		If not by THIS point do we have a compiler, then throw an exception
-		 */
-		if(NOT StructKeyExists(data, "compiler"))
-		{
-			throwException("javaCompiler.NoCompilerAvailableException",
-				"No Java Compiler is available",
-				"There is no Java Compiler available. Make sure tools.jar is in your classpath and you are running Java 1.6+");
-		}
-
-		setCompiler(data.compiler);
-		setJarDirectory(arguments.jarDirectory);
-
-		return this;
-	</cfscript>
-</cffunction>
-
-<cffunction name="compile" hint="compiles Java to bytecode, and returns a JAR" access="public" returntype="any" output="false">
-	<cfargument name="directoryArray" hint="array of directories to compile" type="array" required="Yes">
-	<cfargument name="classLoader" hint="a optional URLClassloader to use as the parent for compilation" type="any" required="false">
-    <cfargument name="jarName" hint="The name of the jar file. Defaults to a UUID" type="string" required="false" default="#createUUID()#.jar">	
-	<cfscript>
-		//setup file manager with default exception handler, default locale, and default character set
-		var fileManager = getCompiler().getStandardFileManager(JavaCast("null", ""), JavaCast("null", ""), JavaCast("null", ""));
-		var qFiles = 0;
-		var fileArray = [];
-		var directoryToCompile = 0;
-		var fileObjects = 0;
-		var osw = createObject("java", "java.io.StringWriter").init();
-		var options = [];
-		var compilePass = 0;
-		var jarPath = getJarDirectory() & "/" & arguments.jarName;
-    </cfscript>
-
-	<cfloop array="#arguments.directoryArray#" index="directoryToCompile">
-		<cfdirectory action="list" directory="#directoryToCompile#" name="qFiles" recurse="true" filter="*.java">
-
-		<cfloop query="qFiles">
-			<cfscript>
-				ArrayAppend(fileArray, qFiles.directory & "/" & qFiles.name);
-	        </cfscript>
-		</cfloop>
-
-		<cfscript>
-			if(structKeyExists(arguments, "classLoader"))
-			{
-				options = addClassLoaderFiles(options, arguments.classLoader, arguments.directoryArray);
-			}
-
-			fileObjects = fileManager.getJavaFileObjectsFromStrings(fileArray);
-        </cfscript>
-	</cfloop>
-
-	<cfscript>
-		//does the compilation
-		compilePass = getCompiler().getTask(osw, fileManager, JavaCast("null", ""), options, JavaCast("null", ""), fileObjects).call();
-
-		if(NOT compilePass)
-		{
-			throwException("javacompiler.SourceCompilationException", "There was an error compiling your source code", osw.toString());
-		}
-    </cfscript>
-
-	<!--- wrap it up in a jar --->
-	<cfloop array="#arguments.directoryArray#" index="directoryToCompile">
-		<!--- do this again, as if there ARE files in it, we should create a .jar --->
-		<cfdirectory action="list" directory="#directoryToCompile#" name="qFiles">
-
-		<!--- can't do zips on empty directories --->
-		<cfif qFiles.recordCount>
-			<cfzip action="zip" file="#jarPath#" recurse="yes" source="#directoryToCompile#" overwrite="no">
-		</cfif>
-	</cfloop>
-
-	<!--- we won't bother with an manifest, as we don't really need one --->
-
-	<cfreturn jarPath />
-</cffunction>
-
-<cffunction name="getVersion" hint="returns the version number" access="public" returntype="string" output="false">
-	<cfreturn "0.1.b" />
-</cffunction>
-
-<!------------------------------------------- PACKAGE ------------------------------------------->
-
-<!------------------------------------------- PRIVATE ------------------------------------------->
-
-<cffunction name="addClassLoaderFiles" hint="adds a set of files to the file manager from the urlclassloader" access="private" returntype="array" output="false">
-	<cfargument name="options" hint="the options array" type="array" required="Yes">
-	<cfargument name="classLoader" hint="URLClassloader to use as the parent for compilation" type="any" required="true">
-	<cfargument name="directoryArray" hint="array of directories to compile" type="array" required="Yes">
-	<cfscript>
-		var urls = 0;
-		var uri = 0;
-		var classPaths = createObject("java", "java.lang.StringBuilder").init();
-		var File = createObject("java", "java.io.File");
-		var path = 0;
-    </cfscript>
-
-	<!--- add in the classloader, and all its parents --->
-	<cfloop condition="#structKeyExists(arguments, "classLoader")#">
-		<cfset urls = arguments.classLoader.getURLs()>
-		<cfloop array="#urls#" index="uri">
-			<cfscript>
-				classPaths.append(uri.getFile()).append(File.pathSeparator);
-            </cfscript>
-		</cfloop>
-		<cfset arguments.classLoader = arguments.classLoader.getParent()>
-	</cfloop>
-
-	<!--- add in the folders we are compiling from --->
-	<cfloop array="#arguments.directoryArray#" index="path">
-		<cfset classPaths.append(path).append(File.pathSeparator)>
-	</cfloop>
-
-	<cfscript>
-		ArrayAppend(arguments.options, "-classpath");
-		ArrayAppend(arguments.options, classPaths.toString());
-
-		return arguments.options;
-    </cfscript>
-</cffunction>
-
-<cffunction name="getCompiler" access="private" returntype="any" output="false">
-	<cfreturn instance.Compiler />
-</cffunction>
-
-<cffunction name="setCompiler" access="private" returntype="void" output="false">
-	<cfargument name="Compiler" type="any" required="true">
-	<cfset instance.Compiler = arguments.Compiler />
-</cffunction>
-
-<cffunction name="getJarDirectory" access="private" returntype="string" output="false">
-	<cfreturn instance.jarDirectory />
-</cffunction>
-
-<cffunction name="setJarDirectory" access="private" returntype="void" output="false">
-	<cfargument name="jarDirectory" type="string" required="true">
-	<cfset instance.jarDirectory = arguments.jarDirectory />
-</cffunction>
-
-<cffunction name="throwException" access="private" hint="Throws an Exception" output="false">
-	<cfargument name="type" hint="The type of exception" type="string" required="Yes">
-	<cfargument name="message" hint="The message to accompany the exception" type="string" required="Yes">
-	<cfargument name="detail" type="string" hint="The detail message for the exception" required="No" default="">
-		<cfthrow type="#arguments.type#" message="#arguments.message#" detail="#arguments.detail#">
-</cffunction>
-
-<cffunction name="println" hint="" access="private" returntype="void" output="false">
-	<cfargument name="str" hint="" type="string" required="Yes">
-	<cfscript>
-		createObject("Java", "java.lang.System").out.println(arguments.str);
-	</cfscript>
-</cffunction>
-
-</cfcomponent>
\ No newline at end of file
diff --git a/models/javaLoader/JavaLoader.cfc b/models/javaLoader/JavaLoader.cfc
deleted file mode 100644
index 7280bdf..0000000
--- a/models/javaLoader/JavaLoader.cfc
+++ /dev/null
@@ -1,570 +0,0 @@
-<!--- Document Information -----------------------------------------------------
-
-Title:      JavaLoader.cfc
-
-Author:     Mark Mandel
-Email:      mark@compoundtheory.com
-
-Website:    http://www.compoundtheory.com
-
-Purpose:    Utlitity class for loading Java Classes
-
-------------------------------------------------------------------------------->
-<cfcomponent name="JavaLoader" hint="Loads External Java Classes, while providing access to ColdFusion classes">
-
-<cfscript>
-	instance = StructNew();
-	instance.static.uuid = "A0608BEC-0AEB-B46A-0E1E1EC5F3CE7C9C";
-</cfscript>
-
-<cfimport taglib="tags" prefix="jl">
-
-<!------------------------------------------- PUBLIC ------------------------------------------->
-
-<cffunction name="init" hint="Constructor" access="public" returntype="JavaLoader" output="false">
-	<cfargument name="loadPaths" hint="An array of directories of classes, or paths to .jar files to load" type="array" default="#ArrayNew(1)#" required="no">
-	<cfargument name="loadColdFusionClassPath" hint="Loads the ColdFusion libraries" type="boolean" required="No" default="false">
-	<cfargument name="parentClassLoader" hint="(Expert use only) The parent java.lang.ClassLoader to set when creating the URLClassLoader" type="any" default="" required="false">
-	<cfargument name="sourceDirectories" hint="Directories that contain Java source code that are to be dynamically compiled" type="array" required="No">
-	<cfargument name="compileDirectory" hint="the directory to build the .jar file for dynamic compilation in, defaults to ./tmp" type="string" required="No" default="#getDirectoryFromPath(getMetadata(this).path)#/tmp">
-	<cfargument name="trustedSource" hint="Whether or not the source is trusted, i.e. it is going to change? Defaults to false, so changes will be recompiled and loaded" type="boolean" required="No" default="false">
-
-	<cfscript>
-		initUseJavaProxyCFC();
-
-		if(arguments.loadColdFusionClassPath)
-		{
-			//arguments.parentClassLoader = createObject("java", "java.lang.Thread").currentThread().getContextClassLoader();
-			//can't use above, as doesn't work in some... things
-
-			arguments.parentClassLoader = getPageContext().getClass().getClassLoader();
-
-			//arguments.parentClassLoader = createObject("java", "java.lang.ClassLoader").getSystemClassLoader();
-			//can't use the above, it doesn't have the CF stuff in it.
-		}
-
-		setClassLoadPaths(arguments.loadPaths);
-		setParentClassLoader(arguments.parentClassLoader);
-
-		ensureNetworkClassLoaderOnServerScope();
-
-		loadClasses();
-
-		if(structKeyExists(arguments, "sourceDirectories") AND ArrayLen(arguments.sourceDirectories))
-		{
-			setJavaCompiler(createObject("component", "JavaCompiler").init(arguments.compileDirectory));
-			setSourceDirectories(arguments.sourceDirectories);
-			setCompileDirectory(arguments.compileDirectory);
-
-            setTrustedSource(arguments.trustedSource);
-
-			compileSource();
-
-			setSourceLastModified(calculateSourceLastModified());
-
-			//do the method switching for non-trusted source
-			if(NOT arguments.trustedSource)
-			{
-				variables.createWithoutCheck = variables.create;
-
-				StructDelete(this, "create");
-				StructDelete(variables, "create");
-
-				this.create = variables.createWithSourceCheck;
-			}
-		}
-
-		return this;
-	</cfscript>
-</cffunction>
-
-<cffunction name="create" hint="Retrieves a reference to the java class. To create a instance, you must run init() on this object" access="public" returntype="any" output="false">
-	<cfargument name="className" hint="The name of the class to create" type="string" required="Yes">
-	<cfscript>
-		try
-		{
-			//do this in one line just for speed.
-			return createJavaProxy(getURLClassLoader().loadClass(arguments.className));
-		}
-		catch(java.lang.ClassNotFoundException exc)
-		{
-			throwException("javaloader.ClassNotFoundException", "The requested class could not be found.", "The requested class '#arguments.className#' could not be found in the loaded jars/directories.");
-		}
-	</cfscript>
-</cffunction>
-
-<cffunction name="getURLClassLoader" hint="Returns the com.compoundtheory.classloader.NetworkClassLoader in case you need access to it" access="public" returntype="any" output="false">
-	<cfreturn instance.ClassLoader />
-</cffunction>
-
-<cffunction name="getClassLoadPaths" access="public" returntype="array" output="false">
-	<cfreturn instance.classLoadPaths />
-</cffunction>
-
-	
-<cffunction name="switchThreadContextClassLoader" hint="Sometimes you will need to switch out the ThreadContextClassLoader with the classloader used by JavaLoader.<br/>
-			It has :
-			switchThreadContextClassLoader(function object, [classLoader=getURLClassLoader()])
-			switchThreadContextClassLoader(function name, [classLoader=getURLClassLoader()])
-			switchThreadContextClassLoader(object, function name, [classLoader=getURLClassLoader()])
-			This method can be used in 3 different ways:
-			<ol>
-				<li>Pass it the UDF itself</li>
-				<li>Pass it the current object and method name that you wish to have called</li>
-				<li>Inject it into your CFC/Page that you want to use, and call it from there, telling it what function to call (you will need to pass in the URLClassLoader)</li>
-			</ol>"
-			access="public" returntype="any" output="false">
-	<cfscript>
-		var local = {};
-		var System = createObject("java", "java.lang.System");
-		var Thread = createObject("java", "java.lang.Thread");
-		var currentClassloader = Thread.currentThread().getContextClassLoader();
-
-		if(structCount(arguments) == 2 && !isSimpleValue(arguments[2]))
-		{
-			classLoader = arguments[2];
-		}
-		else if(structCount(arguments) == 3)
-		{
-			classLoader = arguments[3];
-		}
-		else //assume we are still in JL
-		{
-			classLoader = getURLClassLoader();
-		}
-	</cfscript>
-
-	<cftry>
-		<cfscript>
-			Thread.currentThread().setContextClassLoader(classloader);
-		</cfscript>
-
-		<cfif isSimpleValue(arguments[1])>
-			<cfinvoke method="#arguments[1]#" returnvariable="local.return" />
-		<cfelseif isCustomFunction(arguments[1])>
-			<cfscript>
-				local.func = arguments[1];
-				local.return = local.func();
-			</cfscript>
-		<cfelseif isObject(arguments[1]) AND isSimpleValue(arguments[2])>
-			<cfinvoke component="#arguments[1]#" method="#arguments[2]#" returnvariable="local.return" />
-		<cfelse>
-			<cfthrow type="javaloader.InvalidInvocationException" message="Unable to determine what method to invoke" detail="Please check the documentation for switchThreadContextClassLoader."/>
-		</cfif>
-
-		<cfcatch>
-			<cfscript>
-				Thread.currentThread().setContextClassLoader(currentClassloader);
-			</cfscript>
-			<cfrethrow>
-		</cfcatch>
-	</cftry>
-
-	<cfscript>
-		//need to do this twice, as cf8 has no finally.
-		Thread.currentThread().setContextClassLoader(currentClassloader);
-
-		if(structKeyExists(local, "return"))
-		{
-			return local.return;
-		}
-	</cfscript>
-</cffunction>
-	
-<cffunction name="getVersion" hint="Retrieves the version of the loader you are using" access="public" returntype="string" output="false">
-	<cfreturn "1.1">
-</cffunction>
-
-<!------------------------------------------- PACKAGE ------------------------------------------->
-
-<!------------------------------------------- PRIVATE ------------------------------------------->
-
-<cffunction name="createWithSourceCheck" hint="does the create call, but first makes a source check" access="private" returntype="any" output="false">
-	<cfargument name="className" hint="The name of the class to create" type="string" required="Yes">
-	<cfscript>
-		var dateLastModified = calculateSourceLastModified();
-
-		/*
-			If the source has changed in any way, recompile and load
-		*/
-		if(dateCompare(dateLastModified, getSourceLastModified()) eq 1)
-		{
-			loadClasses();
-			compileSource();
-		}
-
-		//if all the comilation goes according to plan, set the date last modified
-		setSourceLastModified(dateLastModified);
-
-		return createWithoutCheck(argumentCollection=arguments);
-    </cfscript>
-</cffunction>
-
-<cffunction name="loadClasses" hint="loads up the classes in the system" access="private" returntype="void" output="false">
-	<cfscript>
-		var iterator = getClassLoadPaths().iterator();
-		var file = 0;
-		var classLoader = 0;
-		var networkClassLoaderClass = 0;
-		var networkClassLoaderProxy = 0;
-
-		networkClassLoaderClass = getServerURLClassLoader().loadClass("com.compoundtheory.classloader.NetworkClassLoader");
-
-		networkClassLoaderProxy = createJavaProxy(networkClassLoaderClass);
-
-		if(isObject(getParentClassLoader()))
-		{
-			classLoader = networkClassLoaderProxy.init(getParentClassLoader());
-		}
-		else
-		{
-			classLoader = networkClassLoaderProxy.init();
-		}
-
-		while(iterator.hasNext())
-		{
-			file = createObject("java", "java.io.File").init(iterator.next());
-			if(NOT file.exists())
-			{
-				throwException("javaloader.PathNotFoundException", "The path you have specified could not be found", file.getAbsolutePath() & " does not exist");
-			}
-
-			classLoader.addUrl(file.toURL());
-		}
-
-		setURLClassLoader(classLoader);
-    </cfscript>
-</cffunction>
-
-<cffunction name="compileSource" hint="compile dynamic source" access="private" returntype="void" output="false">
-	<cfscript>
-		var dir = 0;
-		var path = 0;
-
-		var paths = 0;
-		var file = 0;
-		var counter = 1;
-		var len = 0;
-		var directories = 0;
-
-		//do check to see if the compiled jar is already there
-		var jarName = calculateJarName(getSourceDirectories());
-		var jar = getCompileDirectory() & "/" & jarName;
-    </cfscript>
-
-    <cfif fileExists(jar)>
-        <cfif isTrustedSource()>
-            <!--- add that jar to the classloader --->
-            <cfset file = createObject("java", "java.io.File").init(jar)>
-            <cfset getURLClassLoader().addURL(file.toURL())>
-            <cfreturn />
-        <cfelse>
-            <cffile action="delete" file="#jar#"/>
-        </cfif>
-    </cfif>
-
-	<cftry>
-	    <cfset path = getCompileDirectory() & "/" & createUUID()/>
-
-		<cfdirectory action="create" directory="#path#">
-
-		<cfscript>
-			//first we copy the source to our tmp dir
-			directories = getSourceDirectories();
-			len = arraylen(directories);
-			for(; counter lte len; counter = counter + 1)
-			{
-				dir = directories[counter];
-				directoryCopy(dir, path);
-			}
-
-			//then we compile it, and grab that jar
-
-			paths = ArrayNew(1); //have to write it this way so CF7 compiles
-			ArrayAppend(paths, path);
-
-			jar = getJavaCompiler().compile(paths, getURLClassLoader(), jarName);
-        </cfscript>
-
-		<!--- add that jar to the classloader --->
-		<cfset file = createObject("java", "java.io.File").init(jar)>
-		<cfset getURLClassLoader().addURL(file.toURL())>
-
-		<!--- delete the files --->
-		<cfif directoryExists(path)>
-			<cfdirectory action="delete" recurse="true" directory="#path#">
-		</cfif>
-
-        <!--- save the file for when trusted source is on ---->
-		<cfif fileExists(jar) AND NOT isTrustedSource()>
-			<cffile action="delete" file="#jar#" />
-		</cfif>
-
-		<cfcatch>
-			<!--- make sure the files are deleted --->
-			<cfif directoryExists(path)>
-				<cfdirectory action="delete" recurse="true" directory="#path#">
-			</cfif>
-
-			<cfrethrow>
-		</cfcatch>
-	</cftry>
-</cffunction>
-
-<cffunction name="calculateJarName" hint="returns the jar file name for a directory array" access="private" returntype="string" output="false">
-    <cfargument name="directoryArray" hint="array of directories to compile" type="array" required="Yes">
-    <cfscript>
-        var file = hash(arrayToList(arguments.directoryArray)) & ".jar";
-
-        return file;
-    </cfscript>
-</cffunction>
-
-<cffunction name="calculateSourceLastModified" hint="returns what the source last modified was" access="private" returntype="date" output="false">
-	<cfscript>
-		var lastModified = createDate(1900, 1, 1);
-		var dir = 0;
-		var qLastModified = 0;
-		var directories = getSourceDirectories();
-		var len = arraylen(directories);
-		var counter = 0;
-    </cfscript>
-
-	<!--- cf7 syntax. Yuck. --->
-	<cfloop from="1" to="#len#" index="counter">
-		<cfset dir = directories[counter]>
-		<jl:directory action="list" directory="#dir#" recurse="true"
-					type="file"
-					sort="dateLastModified desc"
-					name="qLastModified">
-		<cfscript>
-			//it's possible there are no source files.
-			if(qLastModified.recordCount)
-			{
-				//get the latest date modified
-				if(dateCompare(lastModified, qlastModified.dateLastModified) eq -1)
-				{
-					/*
-						This is here, because cfdirectory only ever gives you minute accurate modified
-						date, which is not good enough.
-					*/
-					lastModified = createObject("java", "java.util.Date").init(createObject("java", "java.io.File").init(qLastModified.directory & "/" & qLastModified.name).lastModified());
-				}
-			}
-			else
-			{
-				lastModified = Now();
-			}
-        </cfscript>
-	</cfloop>
-
-	<cfreturn lastModified />
-</cffunction>
-
-<cffunction name="ensureNetworkClassLoaderOnServerScope"
-			hint="makes sure there is a URL class loader on the server scope that can load me up some networkClassLoader goodness"
-			access="private" returntype="void" output="false">
-	<cfscript>
-		var Class = createObject("java", "java.lang.Class");
-		var Array = createObject("java", "java.lang.reflect.Array");
-		var jars = queryJars();
-		var iterator = jars.iterator();
-		var file = 0;
-		var urls = Array.newInstance(Class.forName("java.net.URL"), ArrayLen(jars));
-		var counter = 0;
-		var urlClassLoader = 0;
-		var key = instance.static.uuid & "." & getVersion();
-	</cfscript>
-
-	<cfif NOT StructKeyExists(server, key)>
-    	<cflock name="javaloader.networkclassloader" throwontimeout="true" timeout="60">
-    	<cfscript>
-    		if(NOT StructKeyExists(server, key))
-    		{
-				while(iterator.hasNext())
-				{
-					Array.set(urls, counter, createObject("java", "java.io.File").init(iterator.next()).toURL());
-					counter = counter + 1;
-				}
-
-				urlClassLoader = createObject("java", "java.net.URLClassLoader").init(urls);
-
-				//put it on the server scope
-				server[key] = urlClassLoader;
-			}
-    	</cfscript>
-    	</cflock>
-    </cfif>
-</cffunction>
-
-<cffunction name="createJavaProxy" hint="create a javaproxy, dependent on CF server settings" access="private" returntype="any" output="false">
-	<cfargument name="class" hint="the java class to create the proxy with" type="any" required="Yes">
-	<cfscript>
-		return createObject("java", "coldfusion.runtime.java.JavaProxy").init(arguments.class);
-	</cfscript>
-</cffunction>
-
-<cffunction name="createJavaProxyCFC" hint="create a javaproxy, dependent on CF server settings" access="private" returntype="any" output="false">
-	<cfargument name="class" hint="the java class to create the proxy with" type="any" required="Yes">
-	<cfscript>
-		return createObject("component", "JavaProxy")._init(arguments.class);
-	</cfscript>
-</cffunction>
-
-<cffunction name="initUseJavaProxyCFC" hint="initialise whether or not to use the JavaProxy CFC instead of the coldfusion java object" access="private" returntype="string" output="false">
-	<cfscript>
-		try
-		{
-			createObject("java", "coldfusion.runtime.java.JavaProxy");
-		}
-		catch(Object exc)
-		{
-			//do method replacement, as it will be much faster long term
-			variables.createJavaProxy = variables.createJavaProxyCFC;
-		}
-	</cfscript>
-</cffunction>
-
-<cffunction name="queryJars" hint="pulls a query of all the jars in the /resources/lib folder" access="private" returntype="array" output="false">
-	<cfscript>
-		var qJars = 0;
-		//the path to my jar library
-		var path = getDirectoryFromPath(getMetaData(this).path) & "lib/";
-		var jarList = "";
-		var aJars = ArrayNew(1);
-		var libName = 0;
-	</cfscript>
-
-	<cfdirectory action="list" name="qJars" directory="#path#" filter="*.jar" sort="name desc"/>
-	<cfloop query="qJars">
-		<cfscript>
-			libName = ListGetAt(name, 1, "-");
-			//let's not use the lib's that have the same name, but a lower datestamp
-			if(NOT ListFind(jarList, libName))
-			{
-				ArrayAppend(aJars, path & "/" & name);
-				jarList = ListAppend(jarList, libName);
-			}
-		</cfscript>
-	</cfloop>
-
-	<cfreturn aJars>
-</cffunction>
-
-<cffunction name="setClassLoadPaths" access="private" returntype="void" output="false">
-	<cfargument name="classLoadPaths" type="array" required="true">
-	<cfset instance.classLoadPaths = arguments.classLoadPaths />
-</cffunction>
-
-<cffunction name="getParentClassLoader" access="private" returntype="any" output="false">
-	<cfreturn instance.parentClassLoader />
-</cffunction>
-
-<cffunction name="setParentClassLoader" access="private" returntype="void" output="false">
-	<cfargument name="parentClassLoader" type="any" required="true">
-	<cfset instance.parentClassLoader = arguments.parentClassLoader />
-</cffunction>
-
-<cffunction name="getServerURLClassLoader" hint="returns the server URL class loader" access="private" returntype="any" output="false">
-	<cfreturn server[instance.static.uuid & "." & getVersion()] />
-</cffunction>
-
-<cffunction name="setURLClassLoader" access="private" returntype="void" output="false">
-	<cfargument name="ClassLoader" type="any" required="true">
-	<cfset instance.ClassLoader = arguments.ClassLoader />
-</cffunction>
-
-<cffunction name="hasJavaCompiler" hint="whether this object has a javaCompiler" access="private" returntype="boolean" output="false">
-	<cfreturn StructKeyExists(instance, "javaCompiler") />
-</cffunction>
-
-<cffunction name="getJavaCompiler" access="private" returntype="JavaCompiler" output="false">
-	<cfreturn instance.javaCompiler />
-</cffunction>
-
-<cffunction name="setJavaCompiler" access="private" returntype="void" output="false">
-	<cfargument name="javaCompiler" type="JavaCompiler" required="true">
-	<cfset instance.javaCompiler = arguments.javaCompiler />
-</cffunction>
-
-<cffunction name="getSourceDirectories" access="private" returntype="array" output="false">
-	<cfreturn instance.sourceDirectories />
-</cffunction>
-
-<cffunction name="setSourceDirectories" access="private" returntype="void" output="false">
-	<cfargument name="sourceDirectories" type="array" required="true">
-	<cfset instance.sourceDirectories = arguments.sourceDirectories />
-</cffunction>
-
-<cffunction name="getSourceLastModified" access="private" returntype="date" output="false">
-	<cfreturn instance.sourceLastModified />
-</cffunction>
-
-<cffunction name="setSourceLastModified" access="private" returntype="void" output="false">
-	<cfargument name="sourceLastModified" type="date" required="true">
-	<cfset instance.sourceLastModified = arguments.sourceLastModified />
-</cffunction>
-
-<cffunction name="hasSourceLastModified" hint="whether this object has a sourceLastModified" access="private" returntype="boolean" output="false">
-	<cfreturn StructKeyExists(instance, "sourceLastModified") />
-</cffunction>
-
-<cffunction name="getCompileDirectory" access="private" returntype="string" output="false">
-	<cfreturn instance.compileDirectory />
-</cffunction>
-
-<cffunction name="setCompileDirectory" access="private" returntype="void" output="false">
-	<cfargument name="compileDirectory" type="string" required="true">
-	<cfset instance.compileDirectory = arguments.compileDirectory />
-</cffunction>
-
-<cffunction name="throwException" access="private" hint="Throws an Exception" output="false">
-	<cfargument name="type" hint="The type of exception" type="string" required="Yes">
-	<cfargument name="message" hint="The message to accompany the exception" type="string" required="Yes">
-	<cfargument name="detail" type="string" hint="The detail message for the exception" required="No" default="">
-		<cfthrow type="#arguments.type#" message="#arguments.message#" detail="#arguments.detail#">
-</cffunction>
-
-<cffunction name="isTrustedSource" access="private" returntype="boolean" output="false">
-	<cfreturn instance.isTrustedSource />
-</cffunction>
-
-<cffunction name="setTrustedSource" access="private" returntype="void" output="false">
-	<cfargument name="isTrustedSource" type="boolean" required="true">
-	<cfset instance.isTrustedSource = arguments.isTrustedSource />
-</cffunction>
-
-<!---
-Copies a directory.
-
-@param source      Source directory. (Required)
-@param destination      Destination directory. (Required)
-@param nameConflict      What to do when a conflict occurs (skip, overwrite, makeunique). Defaults to overwrite. (Optional)
-@return Returns nothing.
-@author Joe Rinehart (joe.rinehart@gmail.com)
-@version 1, July 27, 2005
---->
-<cffunction name="directoryCopy" access="private" output="true">
-    <cfargument name="source" required="true" type="string">
-    <cfargument name="destination" required="true" type="string">
-    <cfargument name="nameconflict" required="true" default="overwrite">
-
-    <cfset var contents = "" />
-    <cfset var dirDelim = createObject("java", "java.lang.System").getProperty("file.separator")>
-
-    <cfif not(directoryExists(arguments.destination))>
-        <cfdirectory action="create" directory="#arguments.destination#">
-    </cfif>
-
-    <cfdirectory action="list" directory="#arguments.source#" name="contents">
-
-    <cfloop query="contents">
-        <cfif contents.type eq "file">
-            <cffile action="copy" source="#arguments.source#/#name#" destination="#arguments.destination#/#name#" nameconflict="#arguments.nameConflict#">
-        <cfelseif contents.type eq "dir">
-            <cfset directoryCopy(arguments.source & dirDelim & name, arguments.destination & dirDelim & name) />
-        </cfif>
-    </cfloop>
-</cffunction>
-
-</cfcomponent>
\ No newline at end of file
diff --git a/models/javaLoader/JavaProxy.cfc b/models/javaLoader/JavaProxy.cfc
deleted file mode 100644
index 3f1b812..0000000
--- a/models/javaLoader/JavaProxy.cfc
+++ /dev/null
@@ -1,354 +0,0 @@
-<!--- Document Information -----------------------------------------------------
-
-Title:      JavaProxy.cfc
-
-Author:     Mark Mandel
-Email:      mark@compoundtheory.com
-
-Website:    http://www.compoundtheory.com
-
-Purpose:    JavaProxy to replace the ColdFusion one when you don't have access
-			to coldfusion.* packages due to CF8 settings.
-
-Usage:
-
-Modification Log:
-
-Name			Date			Description
-================================================================================
-Mark Mandel		27/08/2007		Created
-
-------------------------------------------------------------------------------->
-
-<cfcomponent output="false">
-
-<!---
-	All CF based methods have a _ in front, so that they don't interfere with the possible Java
-	calls
- --->
-
-<cffunction name="_init" hint="Constructor" access="public" returntype="JavaProxy" output="false">
-	<cfargument name="class" hint="the java.lang.Class object this represents" type="any" required="Yes">
-	<cfscript>
-		var classLoader = createObject("java", "java.lang.ClassLoader").getSystemClassLoader();
-		var objectClass = classLoader.loadClass("java.lang.Object");
-
-		_setArray(createObject("java", "java.lang.reflect.Array"));
-
-		_setClassMethod(objectClass.getMethod("getClass", JavaCast("null", 0)));
-
-		_setObjectClass(objectClass);
-
-		_setClass(arguments.class);
-
-		_setModifier(createObject("java", "java.lang.reflect.Modifier"));
-
-		_setStaticFields();
-
-		_initMethodCollection();
-
-		return this;
-	</cfscript>
-</cffunction>
-
-<cffunction name="init" hint="create an instance of this object" access="public" returntype="any" output="false">
-	<cfscript>
-		var constructor = 0;
-		var instance = 0;
-
-		//make sure we only ever have one instance
-		if(_hasClassInstance())
-		{
-			return _getClassInstance();
-		}
-
-		constructor = _resolveMethodByParams("Constructor", _getClass().getConstructors(), arguments);
-
-		instance = constructor.newInstance(_buildArgumentArray(arguments));
-
-		_setClassInstance(instance);
-
-		return _getClassInstance();
-	</cfscript>
-</cffunction>
-
-<cffunction	name="onMissingMethod" access="public" returntype="any" output="false" hint="wires the coldfusion invocation to the Java Object">
-	<cfargument	name="missingMethodName" type="string"	required="true"	hint=""	/>
-	<cfargument	name="missingMethodArguments" type="struct" required="true"	hint=""/>
-
-	<cfscript>
-		var method = _findMethod(arguments.missingMethodName, arguments.missingMethodArguments);
-
-		if(_getModifier().isStatic(method.getModifiers()))
-		{
-			return method.invoke(JavaCast("null", 0), _buildArgumentArray(arguments.missingMethodArguments));
-		}
-		else
-		{
-			if(NOT _hasClassInstance())
-			{
-				//run the default constructor, just like in normal CF, if there is no instance
-				init();
-			}
-
-			return method.invoke(_getClassInstance(), _buildArgumentArray(arguments.missingMethodArguments));
-		}
-	</cfscript>
-</cffunction>
-
-<!------------------------------------------- PUBLIC ------------------------------------------->
-
-<!------------------------------------------- PACKAGE ------------------------------------------->
-
-<!------------------------------------------- PRIVATE ------------------------------------------->
-
-<cffunction name="_setStaticFields" hint="loops around all the fields and sets the static one to this scope" access="private" returntype="void" output="false">
-	<cfscript>
-		var fields = _getClass().getFields();
-		var counter = 1;
-		var len = ArrayLen(fields);
-		var field = 0;
-
-		for(; counter <= len; counter++)
-		{
-			field = fields[counter];
-			if(_getModifier().isStatic(field.getModifiers()))
-			{
-				this[field.getName()] = field.get(JavaCast("null", 0));
-			}
-		}
-	</cfscript>
-</cffunction>
-
-<cffunction name="_buildArgumentArray" hint="builds an argument array out of the arguments" access="private" returntype="array" output="false">
-	<cfargument name="arguments" hint="the arguments passed through" type="struct" required="Yes">
-	<cfscript>
-		var len = StructCount(arguments);
-		var objArray = _getArray().newInstance(_getObjectClass(), len);
-		var counter = 1;
-		var obj = 0;
-
-		for(; counter <= len; counter++)
-		{
-			obj = arguments[counter];
-			_getArray().set(objArray, counter - 1, obj);
-		}
-
-		return objArray;
-	</cfscript>
-</cffunction>
-
-<cffunction name="_findMethod" hint="finds the method that closest matches the signature" access="public" returntype="any" output="false">
-	<cfargument name="methodName" hint="the name of the method" type="string" required="Yes">
-	<cfargument name="methodArgs" hint="the arguments to look for" type="struct" required="Yes">
-	<cfscript>
-		var decision = 0;
-
-		if(StructKeyExists(_getMethodCollection(), arguments.methodName))
-		{
-			decision = StructFind(_getMethodCollection(), arguments.methodName);
-
-			//if there is only one option, try it, it's only going to throw a runtime exception if it doesn't work.
-			if(ArrayLen(decision) == 1)
-			{
-				return decision[1];
-			}
-			else
-			{
-				return _resolveMethodByParams(arguments.methodName, decision, arguments.methodArgs);
-			}
-		}
-
-		throwException("JavaProxy.MethodNotFoundException", "Could not find the designated method", "Could not find the method '#arguments.methodName#' in the class #_getClass().getName()#");
-	</cfscript>
-</cffunction>
-
-<cffunction name="_resolveMethodByParams" hint="resolves the method to use by the parameters provided" access="private" returntype="any" output="false">
-	<cfargument name="methodName" hint="the name of the method" type="string" required="Yes">
-	<cfargument name="decision" hint="the array of methods to decide from" type="array" required="Yes">
-	<cfargument name="methodArgs" hint="the arguments to look for" type="struct" required="Yes">
-	<cfscript>
-		var decisionLen = ArrayLen(arguments.decision);
-		var method = 0;
-		var counter = 1;
-		var argLen = ArrayLen(arguments.methodArgs);
-		var parameters = 0;
-		var paramLen = 0;
-		var pCounter = 0;
-		var param = 0;
-		var class = 0;
-		var found = true;
-
-		for(; counter <= decisionLen; counter++)
-		{
-			method = arguments.decision[counter];
-			parameters = method.getParameterTypes();
-			paramLen = ArrayLen(parameters);
-
-			found = true;
-
-			if(argLen eq paramLen)
-			{
-				for(pCounter = 1; pCounter <= paramLen AND found; pCounter++)
-				{
-					param = parameters[pCounter];
-					class = _getClassMethod().invoke(arguments.methodArgs[pCounter], JavaCast("null", 0));
-
-					if(param.isAssignableFrom(class))
-					{
-						found = true;
-					}
-					else if(param.isPrimitive()) //if it's a primitive, it can be mapped to object primtive classes
-					{
-						if(param.getName() eq "boolean" AND class.getName() eq "java.lang.Boolean")
-						{
-							found = true;
-						}
-						else if(param.getName() eq "int" AND class.getName() eq "java.lang.Integer")
-						{
-							found = true;
-						}
-						else if(param.getName() eq "long" AND class.getName() eq "java.lang.Long")
-						{
-							found = true;
-						}
-						else if(param.getName() eq "float" AND class.getName() eq "java.lang.Float")
-						{
-							found = true;
-						}
-						else if(param.getName() eq "double" AND class.getName() eq "java.lang.Double")
-						{
-							found = true;
-						}
-						else if(param.getName() eq "char" AND class.getName() eq "java.lang.Character")
-						{
-							found = true;
-						}
-						else if(param.getName() eq "byte" AND class.getName() eq "java.lang.Byte")
-						{
-							found = true;
-						}
-						else if(param.getName() eq "short" AND class.getName() eq "java.lang.Short")
-						{
-							found = true;
-						}
-						else
-						{
-							found = false;
-						}
-					}
-					else
-					{
-						found = false;
-					}
-				}
-
-				if(found)
-				{
-					return method;
-				}
-			}
-		}
-
-		throwException("JavaProxy.MethodNotFoundException", "Could not find the designated method", "Could not find the method '#arguments.methodName#' in the class #_getClass().getName()#");
-	</cfscript>
-</cffunction>
-
-<cffunction name="_initMethodCollection" hint="creates a method collection of all the methods that are available on the class (this may be cached externally later)" access="private" returntype="void" output="false">
-	<cfscript>
-		var methods = _getClass().getMethods();
-		var len = ArrayLen(methods);
-		var counter = 1;
-		var method = 0;
-
-		_setMethodCollection(StructNew());
-
-		for(; counter <= len; counter++)
-		{
-			method = methods[counter];
-
-			if(NOT StructKeyExists(_getMethodCollection(), method.getName()))
-			{
-				StructInsert(_getMethodCollection(), method.getName(), ArrayNew(1));
-			}
-
-			ArrayAppend(StructFind(_getMethodCollection(), method.getName()), method);
-		}
-	</cfscript>
-</cffunction>
-
-<cffunction name="_getMethodCollection" access="private" returntype="struct" output="false">
-	<cfreturn instance.MethodCollection />
-</cffunction>
-
-<cffunction name="_setMethodCollection" access="private" returntype="void" output="false">
-	<cfargument name="MethodCollection" type="struct" required="true">
-	<cfset instance.MethodCollection = arguments.MethodCollection />
-</cffunction>
-
-<cffunction name="_hasClassInstance" hint="if the proxy has an instance yet" access="private" returntype="boolean" output="false">
-	<cfreturn StructKeyExists(instance, "ClassInstance") />
-</cffunction>
-
-<cffunction name="_getClassInstance" access="private" returntype="any" output="false">
-	<cfreturn instance.ClassInstance />
-</cffunction>
-
-<cffunction name="_setClassInstance" access="private" returntype="void" output="false">
-	<cfargument name="ClassInstance" type="any" required="true">
-	<cfset instance.ClassInstance = arguments.ClassInstance />
-</cffunction>
-
-<cffunction name="_getObjectClass" access="private" returntype="any" output="false">
-	<cfreturn instance.ObjectClass />
-</cffunction>
-
-<cffunction name="_setObjectClass" access="private" returntype="void" output="false">
-	<cfargument name="ObjectClass" type="any" required="true">
-	<cfset instance.ObjectClass = arguments.ObjectClass />
-</cffunction>
-
-<cffunction name="_getArray" access="private" returntype="any" output="false">
-	<cfreturn instance.Array />
-</cffunction>
-
-<cffunction name="_setArray" access="private" returntype="void" output="false">
-	<cfargument name="Array" type="any" required="true">
-	<cfset instance.Array = arguments.Array />
-</cffunction>
-
-<cffunction name="_getClassMethod" access="private" returntype="any" output="false">
-	<cfreturn instance.ClassMethod />
-</cffunction>
-
-<cffunction name="_setClassMethod" access="private" returntype="void" output="false">
-	<cfargument name="ClassMethod" type="any" required="true">
-	<cfset instance.ClassMethod = arguments.ClassMethod />
-</cffunction>
-
-<cffunction name="_getClass" access="private" returntype="any" output="false">
-	<cfreturn instance.Class />
-</cffunction>
-
-<cffunction name="_setClass" access="private" returntype="void" output="false">
-	<cfargument name="Class" type="any" required="true">
-	<cfset instance.Class = arguments.Class />
-</cffunction>
-
-<cffunction name="_getModifier" access="private" returntype="any" output="false">
-	<cfreturn instance.Modifier />
-</cffunction>
-
-<cffunction name="_setModifier" access="private" returntype="void" output="false">
-	<cfargument name="Modifier" type="any" required="true">
-	<cfset instance.Modifier = arguments.Modifier />
-</cffunction>
-
-<cffunction name="throwException" access="private" hint="Throws an Exception" output="false">
-	<cfargument name="type" hint="The type of exception" type="string" required="Yes">
-	<cfargument name="message" hint="The message to accompany the exception" type="string" required="Yes">
-	<cfargument name="detail" type="string" hint="The detail message for the exception" required="No" default="">
-		<cfthrow type="#arguments.type#" message="#arguments.message#" detail="#arguments.detail#">
-</cffunction>
-
-</cfcomponent>
\ No newline at end of file
diff --git a/models/javaLoader/lib/classloader-20120103162851.jar b/models/javaLoader/lib/classloader-20120103162851.jar
deleted file mode 100644
index ea07000..0000000
Binary files a/models/javaLoader/lib/classloader-20120103162851.jar and /dev/null differ
diff --git a/models/javaLoader/lib/classloader-src.zip b/models/javaLoader/lib/classloader-src.zip
deleted file mode 100644
index e86f27e..0000000
Binary files a/models/javaLoader/lib/classloader-src.zip and /dev/null differ
diff --git a/models/javaLoader/licence.txt b/models/javaLoader/licence.txt
deleted file mode 100644
index c9990a7..0000000
--- a/models/javaLoader/licence.txt
+++ /dev/null
@@ -1,213 +0,0 @@
-Common Public License Version 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
-LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-    a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-
-    b) in the case of each subsequent Contributor:
-
-    i) changes to the Program, and
-
-    ii) additions to the Program;
-
-    where such changes and/or additions to the Program originate from and are
-distributed by that particular Contributor. A Contribution 'originates' from a
-Contributor if it was added to the Program by such Contributor itself or anyone
-acting on such Contributor's behalf. Contributions do not include additions to
-the Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii) are not
-derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are
-necessarily infringed by the use or sale of its Contribution alone or when
-combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement,
-including all Contributors.
-
-2. GRANT OF RIGHTS
-
-    a) Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free copyright license to
-reproduce, prepare derivative works of, publicly display, publicly perform,
-distribute and sublicense the Contribution of such Contributor, if any, and such
-derivative works, in source code and object code form.
-
-    b) Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
-Patents to make, use, sell, offer to sell, import and otherwise transfer the
-Contribution of such Contributor, if any, in source code and object code form.
-This patent license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor, such
-addition of the Contribution causes such combination to be covered by the
-Licensed Patents. The patent license shall not apply to any other combinations
-which include the Contribution. No hardware per se is licensed hereunder.
-
-    c) Recipient understands that although each Contributor grants the licenses
-to its Contributions set forth herein, no assurances are provided by any
-Contributor that the Program does not infringe the patent or other intellectual
-property rights of any other entity. Each Contributor disclaims any liability to
-Recipient for claims brought by any other entity based on infringement of
-intellectual property rights or otherwise. As a condition to exercising the
-rights and licenses granted hereunder, each Recipient hereby assumes sole
-responsibility to secure any other intellectual property rights needed, if any.
-For example, if a third party patent license is required to allow Recipient to
-distribute the Program, it is Recipient's responsibility to acquire that license
-before distributing the Program.
-
-    d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright license set
-forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its
-own license agreement, provided that:
-
-    a) it complies with the terms and conditions of this Agreement; and
-
-    b) its license agreement:
-
-    i) effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title and
-non-infringement, and implied warranties or conditions of merchantability and
-fitness for a particular purpose;
-
-    ii) effectively excludes on behalf of all Contributors all liability for
-damages, including direct, indirect, special, incidental and consequential
-damages, such as lost profits;
-
-    iii) states that any provisions which differ from this Agreement are offered
-by that Contributor alone and not by any other party; and
-
-    iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable manner on or
-through a medium customarily used for software exchange. 
-
-When the Program is made available in source code form:
-
-    a) it must be made available under this Agreement; and
-
-    b) a copy of this Agreement must be included with each copy of the Program. 
-
-Contributors may not remove or alter any copyright notices contained within the
-Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if
-any, in a manner that reasonably allows subsequent Recipients to identify the
-originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with
-respect to end users, business partners and the like. While this license is
-intended to facilitate the commercial use of the Program, the Contributor who
-includes the Program in a commercial product offering should do so in a manner
-which does not create potential liability for other Contributors. Therefore, if
-a Contributor includes the Program in a commercial product offering, such
-Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-every other Contributor ("Indemnified Contributor") against any losses, damages
-and costs (collectively "Losses") arising from claims, lawsuits and other legal
-actions brought by a third party against the Indemnified Contributor to the
-extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor to
-control, and cooperate with the Commercial Contributor in, the defense and any
-related settlement negotiations. The Indemnified Contributor may participate in
-any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product
-offering, Product X. That Contributor is then a Commercial Contributor. If that
-Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such
-Commercial Contributor's responsibility alone. Under this section, the
-Commercial Contributor would have to defend claims against the other
-Contributors related to those performance claims and warranties, and if a court
-requires any other Contributor to pay any damages as a result, the Commercial
-Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-Recipient is solely responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its exercise of
-rights under this Agreement, including but not limited to the risks and costs of
-program errors, compliance with applicable laws, damage to or loss of data,
-programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable
-law, it shall not affect the validity or enforceability of the remainder of the
-terms of this Agreement, and without further action by the parties hereto, such
-provision shall be reformed to the minimum extent necessary to make such
-provision valid and enforceable.
-
-If Recipient institutes patent litigation against a Contributor with respect to
-a patent applicable to software (including a cross-claim or counterclaim in a
-lawsuit), then any patent licenses granted by that Contributor to such Recipient
-under this Agreement shall terminate as of the date such litigation is filed. In
-addition, if Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the Program
-itself (excluding combinations of the Program with other software or hardware)
-infringes such Recipient's patent(s), then such Recipient's rights granted under
-Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to
-comply with any of the material terms or conditions of this Agreement and does
-not cure such failure in a reasonable period of time after becoming aware of
-such noncompliance. If all Recipient's rights under this Agreement terminate,
-Recipient agrees to cease use and distribution of the Program as soon as
-reasonably practicable. However, Recipient's obligations under this Agreement
-and any licenses granted by Recipient relating to the Program shall continue and
-survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in
-order to avoid inconsistency the Agreement is copyrighted and may only be
-modified in the following manner. The Agreement Steward reserves the right to
-publish new versions (including revisions) of this Agreement from time to time.
-No one other than the Agreement Steward has the right to modify this Agreement.
-IBM is the initial Agreement Steward. IBM may assign the responsibility to serve
-as the Agreement Steward to a suitable separate entity. Each new version of the
-Agreement will be given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the Agreement
-under which it was received. In addition, after a new version of the Agreement
-is published, Contributor may elect to distribute the Program (including its
-Contributions) under the new version. Except as expressly stated in Sections
-2(a) and 2(b) above, Recipient receives no rights or licenses to the
-intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the
-intellectual property laws of the United States of America. No party to this
-Agreement will bring a legal action under this Agreement more than one year
-after the cause of action arose. Each party waives its rights to a jury trial in
-any resulting litigation.
diff --git a/models/javaLoader/readme.txt b/models/javaLoader/readme.txt
deleted file mode 100644
index 1d035a6..0000000
--- a/models/javaLoader/readme.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-JavaLoader v1.0
-Author: Mark Mandel
-Date: 10 September 2010
-
-Documentation can now be found at:
-http://www.compoundtheory.com/javaloader/docs/
\ No newline at end of file
diff --git a/models/javaLoader/support/cfcdynamicproxy/lib/cfcdynamicproxy-src.zip b/models/javaLoader/support/cfcdynamicproxy/lib/cfcdynamicproxy-src.zip
deleted file mode 100644
index f3b9d83..0000000
Binary files a/models/javaLoader/support/cfcdynamicproxy/lib/cfcdynamicproxy-src.zip and /dev/null differ
diff --git a/models/javaLoader/support/cfcdynamicproxy/lib/cfcdynamicproxy.jar b/models/javaLoader/support/cfcdynamicproxy/lib/cfcdynamicproxy.jar
deleted file mode 100644
index 4c4afc2..0000000
Binary files a/models/javaLoader/support/cfcdynamicproxy/lib/cfcdynamicproxy.jar and /dev/null differ
diff --git a/models/javaLoader/support/spring/lib/spring-coldfusion-src.zip b/models/javaLoader/support/spring/lib/spring-coldfusion-src.zip
deleted file mode 100644
index d308f05..0000000
Binary files a/models/javaLoader/support/spring/lib/spring-coldfusion-src.zip and /dev/null differ
diff --git a/models/javaLoader/support/spring/lib/spring-coldfusion.jar b/models/javaLoader/support/spring/lib/spring-coldfusion.jar
deleted file mode 100644
index daa64a1..0000000
Binary files a/models/javaLoader/support/spring/lib/spring-coldfusion.jar and /dev/null differ
diff --git a/models/javaLoader/tags/directory.cfm b/models/javaLoader/tags/directory.cfm
deleted file mode 100644
index 3601708..0000000
--- a/models/javaLoader/tags/directory.cfm
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--- Document Information -----------------------------------------------------
-
-Title:      directory.cfm
-
-Author:     Mark Mandel
-Email:      mark@compoundtheory.com
-
-Website:    http://www.compoundtheory.com
-
-Purpose:    Tag proxy for cf7 compilation
-
-Usage:
-
-Modification Log:
-
-Name			Date			Description
-================================================================================
-Mark Mandel		18/01/2010		Created
-
-------------------------------------------------------------------------------->
-
-<cfif structKeyExists(attributes, "name")>
-	<cfset attributes.name = "caller." & attributes.name>
-</cfif>
-<cfdirectory attributecollection="#attributes#" />
diff --git a/modules/PutStuffHere.txt b/modules/PutStuffHere.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/views/_templates/404.html b/views/_templates/404.html
deleted file mode 100644
index c024a94..0000000
--- a/views/_templates/404.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
-  <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-  <title>The page you requested does not exist</title>
-	<style type="text/css">
-		body { background-color: #fff; text-align: center; font-family: arial, sans-serif; }
-		div.infobox {
-			width: 30em;
-			padding: 0 4em;
-			margin: 4em auto 0 auto;
-			border: 1px solid #ccc;
-			border-right-color: #999;
-			border-bottom-color: #999;
-			background-color: #FFFFF0;
-		}
-		h1 { font-size: 100%; font-weight: bold; color: #000; line-height: 1.5em; }
-	</style>
-</head>
-
-<body>
-  <div class="infobox">
-    <h1>The page you requested does not exist.</h1>
-    <p>You may have mistyped the address or the page may have moved. Please check your address again.</p>
-  </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/views/_templates/generic_error.cfm b/views/_templates/generic_error.cfm
deleted file mode 100644
index ee39085..0000000
--- a/views/_templates/generic_error.cfm
+++ /dev/null
@@ -1,43 +0,0 @@
-<cfset exception = event.getValue( name="exception", private=true )>
-<h3>An Unhandled Exception Occurred</h3>
-<cfoutput>
-<table>
-	<tr>
-		<td colspan="2">An unhandled exception has occurred. Please look at the diagnostic information below:</td>
-	</tr>
-	<tr>
-		<td valign="top"><strong>Type</strong></td>
-		<td valign="top">#exception.getType()#</td>
-	</tr>
-	<tr>
-		<td valign="top"><strong>Message</strong></td>
-		<td valign="top">#exception.getMessage()#</td>
-	</tr>
-	<tr>
-		<td valign="top"><strong>Detail</strong></td>
-		<td valign="top">#exception.getDetail()#</td>
-	</tr>
-	<tr>
-		<td valign="top"><strong>Extended Info</strong></td>
-		<td valign="top">#exception.getExtendedInfo()#</td>
-	</tr>
-	<tr>
-		<td valign="top"><strong>Message</strong></td>
-		<td valign="top">#exception.getMessage()#</td>
-	</tr>
-	<tr>
-		<td valign="top"><strong>Tag Context</strong></td>
-		<td valign="top">
-	       <cfset variables.tagCtxArr = exception.getTagContext() />
-	       <cfloop index="i" from="1" to="#ArrayLen(variables.tagCtxArr)#">
-	               <cfset variables.tagCtx = variables.tagCtxArr[i] />
-	               #variables.tagCtx['template']# (#variables.tagCtx['line']#)<br>
-	       </cfloop>
-		</td>
-	</tr>
-	<tr>
-		<td valign="top"><strong>Stack Trace</strong></td>
-		<td valign="top">#exception.getStackTrace()#</td>
-	</tr>
-</table>
-</cfoutput>
diff --git a/views/main/print.cfm b/views/main/print.cfm
index 27b24b2..2a7a265 100644
--- a/views/main/print.cfm
+++ b/views/main/print.cfm
@@ -1,63 +1,6 @@
-<cffunction name="safeVariable">
-	<cfargument name="inputval" default="">
-	
-	<cfreturn REReplace(ARGUMENTS.inputval,"[^0-9A-Za-z]","","all")>
-</cffunction>	
 
-<cfscript>
-result=queryNew("directory,file,rule,message,linenumber,category,severity");
-for(var i=1; i<=ArrayLen(session.results);i=(i+1)){
-queryAddRow(result);
-querySetCell(result,"directory",session.results[i].directory);
-querySetCell(result,"file",session.results[i].file);
-querySetCell(result,"rule",session.results[i].rule);
-querySetCell(result,"message",session.results[i].message);
-querySetCell(result,"linenumber",session.results[i].linenumber);
-querySetCell(result,"category",session.results[i].category);
-querySetCell(result,"severity",session.results[i].severity);
-}
-</cfscript>
-
-<!---This returns a distinct list of comma seperated categories--->
-<cfset vCategories = listToArray(session.categories)>
-
-<!--- Queries are created named from the categories --->
-<cfloop index="k" array="#vCategories#">
-	<cfquery name="#safeVariable(k)#" dbtype="query">
-		select directory,file,rule,message,linenumber,category,severity from result where category= <cfqueryparam cfsqltype="cf_sql_varchar" value="#k#" /> order by category
-	</cfquery>
-</cfloop>
-
-<!--- Spreadsheet gets dynamically created --->
-<cfscript>
-		counter = 0;
-		spreadsheet = createObject('component','models.SpreadSheet.Spreadsheet').init();
-		writeDump( spreadsheet );
-		//spreadsheet = New spreadsheet();
-		workbook = spreadsheet.new();
-for(i=1;i<=arrayLen(vCategories);i++){
-		counter = counter + 1;
-		value = safeVariable(vCategories[i]);
-		rc = value & '.recordcount';
-		if(rc gt 0); {
-		data = 'data' & counter;
-		data = Evaluate(value);
-		spreadsheet.createSheet( workbook,#left(LCase(value),30)#);
-		spreadsheet.setActiveSheet(workbook,#left(LCase(value),30)#);
-		spreadsheet.addRow(workbook=workbook, data="directory,file,rule,message,linenumber,category,severity,Developer-Assigned,Status", autoSizeColumns=1);
-		spreadsheet.addRows(workbook,data);
-		}
-}
-
-		spreadsheet.removesheet(workbook,"Sheet1");
-		spreadsheet.setActiveSheetNumber(workbook,1);
-		//path = "checker.xls";
-		//overwrite="yes";
-		//spreadsheet.write( workbook,path,overwrite );
-		binary=spreadsheet.readBinary(workbook);
-</cfscript>
 <cfheader name="Content-Disposition" value="inline;filename=#dateformat(now(),"yyyymmdd")##timeformat(now(),"hhmm")#_codechecker.xls">
-<cfcontent type="application/vnd.ms-excel" variable="#binary#">
+<cfcontent type="application/vnd.ms-excel" variable="#prc.binary#">