diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..ac8a30a
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,250 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/phpdox.xml b/build/phpdox.xml
new file mode 100644
index 0000000..a1592f7
--- /dev/null
+++ b/build/phpdox.xml
@@ -0,0 +1,118 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/phpunit.xml b/build/phpunit.xml
new file mode 100644
index 0000000..87e74da
--- /dev/null
+++ b/build/phpunit.xml
@@ -0,0 +1,46 @@
+
+
+
+
+ ../src/*
+ autoload.php
+
+
+
+
+ ../tests/core/core_test.php
+ ../tests/core/query_parser_test.php
+ ../tests/core/connection_manager_test.php
+
+
+ ../tests/databases/mysql/MySQLTest.php
+ ../tests/databases/mysql/MySQLQBTest.php
+
+
+ ../tests/databases/pgsql/PgSQLTest.php
+ ../tests/databases/pgsql/PgSQLQBTest.php
+
+
+ ../tests/databases/sqlite/SQLiteTest.php
+ ../tests/databases/sqlite/SQLiteQBTest.php
+
+
+ ../tests/databases/firebird/FirebirdTest.php
+ ../tests/databases/firebird/FirebirdQBTest.php
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 0000000..68e62b4
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,6 @@
+sonar.projectKey=query
+sonar.projectName=Query Builder
+sonar.projectVersion=1.0
+sonar.sources=src
+sonar.php.coverage.overallReportPath=build/logs/clover.xml
+sonar.php.tests.reportPath=build/logs/junit.xml
\ No newline at end of file
diff --git a/src/Query/Query_Builder.php b/src/Query/Query_Builder.php
index 6c06cd1..050c310 100644
--- a/src/Query/Query_Builder.php
+++ b/src/Query/Query_Builder.php
@@ -26,153 +26,6 @@ namespace Query;
*/
class Query_Builder extends Abstract_Query_Builder implements Query_Builder_Interface {
- // --------------------------------------------------------------------------
- // ! SQL Clause Strings
- // --------------------------------------------------------------------------
-
- /**
- * Compiled 'select' clause
- * @var string
- */
- protected $select_string = '';
-
- /**
- * Compiled 'from' clause
- * @var string
- */
- protected $from_string;
-
- /**
- * Compiled arguments for insert / update
- * @var string
- */
- protected $set_string;
-
- /**
- * Order by clause
- * @var string
- */
- protected $order_string;
-
- /**
- * Group by clause
- * @var string
- */
- protected $group_string;
-
- // --------------------------------------------------------------------------
- // ! SQL Clause Arrays
- // --------------------------------------------------------------------------
-
- /**
- * Keys for insert/update statement
- * @var array
- */
- protected $set_array_keys = array();
-
- /**
- * Key/val pairs for order by clause
- * @var array
- */
- protected $order_array = array();
-
- /**
- * Key/val pairs for group by clause
- * @var array
- */
- protected $group_array = array();
-
- // --------------------------------------------------------------------------
- // ! Other Class vars
- // --------------------------------------------------------------------------
-
- /**
- * Values to apply to prepared statements
- * @var array
- */
- protected $values = array();
-
- /**
- * Values to apply to where clauses in prepared statements
- * @var array
- */
- protected $where_values = array();
-
- /**
- * Value for limit string
- * @var int
- */
- protected $limit;
-
- /**
- * Value for offset in limit string
- * @var bool|int
- */
- protected $offset;
-
- /**
- * Query component order mapping
- * for complex select queries
- *
- * Format:
- * array(
- * 'type' => 'where',
- * 'conjunction' => ' AND ',
- * 'string' => 'k=?'
- * )
- *
- * @var array
- */
- protected $query_map = array();
-
- /**
- * Map for having clause
- * @var array
- */
- protected $having_map;
-
- /**
- * Convenience property for connection management
- * @var string
- */
- public $conn_name = "";
-
- /**
- * List of queries executed
- * @var array
- */
- public $queries;
-
- /**
- * Whether to do only an explain on the query
- * @var bool
- */
- protected $explain;
-
- /**
- * The current database driver
- * @var Driver_Interface
- */
- public $db;
-
- /**
- * Query parser class instance
- * @var Query_Parser
- */
- protected $parser;
-
- /**
- * Alias to driver util class
- * @var Abstract_Util
- */
- public $util;
-
- /**
- * Alias to driver sql class
- * @var SQL_Interface
- */
- public $sql;
-
/**
* String class values to be reset
*