diff --git a/docs/classes.svg b/docs/classes.svg
index 012132b..e57f0a7 100644
--- a/docs/classes.svg
+++ b/docs/classes.svg
@@ -4,48 +4,62 @@
 <!-- Generated by graphviz version 2.26.3 (20100126.1600)
  -->
 <!-- Title: G Pages: 1 -->
-<svg width="380pt" height="367pt"
- viewBox="0.00 0.00 380.00 367.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph1" class="graph" transform="scale(1 1) rotate(0) translate(4 363)">
+<svg width="380pt" height="475pt"
+ viewBox="0.00 0.00 380.00 475.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph1" class="graph" transform="scale(1 1) rotate(0) translate(4 471)">
 <title>G</title>
-<polygon fill="white" stroke="white" points="-4,5 -4,-363 377,-363 377,5 -4,5"/>
+<polygon fill="white" stroke="white" points="-4,5 -4,-471 377,-471 377,5 -4,5"/>
 <g id="graph2" class="cluster"><title>cluster_OpenSQLManager</title>
 <polyline fill="none" stroke="gray" points="222,-8 352,-8 "/>
 <path fill="none" stroke="gray" d="M352,-8C358,-8 364,-14 364,-20"/>
-<polyline fill="none" stroke="gray" points="364,-20 364,-339 "/>
-<path fill="none" stroke="gray" d="M364,-339C364,-345 358,-351 352,-351"/>
-<polyline fill="none" stroke="gray" points="352,-351 222,-351 "/>
-<path fill="none" stroke="gray" d="M222,-351C216,-351 210,-345 210,-339"/>
-<polyline fill="none" stroke="gray" points="210,-339 210,-20 "/>
+<polyline fill="none" stroke="gray" points="364,-20 364,-447 "/>
+<path fill="none" stroke="gray" d="M364,-447C364,-453 358,-459 352,-459"/>
+<polyline fill="none" stroke="gray" points="352,-459 222,-459 "/>
+<path fill="none" stroke="gray" d="M222,-459C216,-459 210,-453 210,-447"/>
+<polyline fill="none" stroke="gray" points="210,-447 210,-20 "/>
 <path fill="none" stroke="gray" d="M210,-20C210,-14 216,-8 222,-8"/>
-<text text-anchor="middle" x="287" y="-337.1" font-family="Times Roman,serif" font-size="11.00" fill="gray">OpenSQLManager</text>
+<text text-anchor="middle" x="287" y="-445.1" font-family="Times Roman,serif" font-size="11.00" fill="gray">OpenSQLManager</text>
 </g>
 <!-- \\OpenSQLManager\\OpenSQLManager -->
 <g id="node2" class="node"><title>\\OpenSQLManager\\OpenSQLManager</title>
 <a xlink:href="OpenSQLManager.html" xlink:title="OpenSQLManager" target="_parent">
-<polygon fill="none" stroke="black" points="342,-322 232,-322 232,-286 342,-286 342,-322"/>
-<text text-anchor="middle" x="287" y="-300.6" font-family="Courier,monospace" font-size="11.00">OpenSQLManager</text>
+<polygon fill="none" stroke="black" points="342,-430 232,-430 232,-394 342,-394 342,-430"/>
+<text text-anchor="middle" x="287" y="-408.6" font-family="Courier,monospace" font-size="11.00">OpenSQLManager</text>
 </a>
 </g>
 <!-- \\wxApp -->
-<g id="node9" class="node"><title>\\wxApp</title>
-<ellipse fill="none" stroke="black" cx="73" cy="-304" rx="45.7889" ry="18"/>
-<text text-anchor="middle" x="73" y="-299.4" font-family="Times Roman,serif" font-size="14.00" fill="gray">\wxApp</text>
+<g id="node11" class="node"><title>\\wxApp</title>
+<ellipse fill="none" stroke="black" cx="73" cy="-412" rx="45.7889" ry="18"/>
+<text text-anchor="middle" x="73" y="-407.4" font-family="Times Roman,serif" font-size="14.00" fill="gray">\wxApp</text>
 </g>
 <!-- \\OpenSQLManager\\OpenSQLManager&#45;&gt;\\wxApp -->
 <g id="edge3" class="edge"><title>\\OpenSQLManager\\OpenSQLManager&#45;&gt;\\wxApp</title>
-<path fill="none" stroke="black" d="M231.333,-304C200.179,-304 161.416,-304 130.042,-304"/>
-<polygon fill="none" stroke="black" points="129.707,-300.5 119.707,-304 129.707,-307.5 129.707,-300.5"/>
+<path fill="none" stroke="black" d="M231.333,-412C200.179,-412 161.416,-412 130.042,-412"/>
+<polygon fill="none" stroke="black" points="129.707,-408.5 119.707,-412 129.707,-415.5 129.707,-408.5"/>
+</g>
+<!-- \\OpenSQLManager\\DB_Reg -->
+<g id="node3" class="node"><title>\\OpenSQLManager\\DB_Reg</title>
+<a xlink:href="sys.common.db_reg.html" xlink:title="DB_Reg" target="_parent">
+<polygon fill="none" stroke="black" points="315,-376 259,-376 259,-340 315,-340 315,-376"/>
+<text text-anchor="middle" x="287" y="-354.6" font-family="Courier,monospace" font-size="11.00">DB_Reg</text>
+</a>
+</g>
+<!-- \\OpenSQLManager\\Settings -->
+<g id="node4" class="node"><title>\\OpenSQLManager\\Settings</title>
+<a xlink:href="sys.common.settings.html" xlink:title="Settings" target="_parent">
+<polygon fill="none" stroke="black" points="322,-322 252,-322 252,-286 322,-286 322,-322"/>
+<text text-anchor="middle" x="287" y="-300.6" font-family="Courier,monospace" font-size="11.00">Settings</text>
+</a>
 </g>
 <!-- \\OpenSQLManager\\Connection_Sidebar -->
-<g id="node3" class="node"><title>\\OpenSQLManager\\Connection_Sidebar</title>
+<g id="node5" class="node"><title>\\OpenSQLManager\\Connection_Sidebar</title>
 <a xlink:href="sys.widgets.connection_sidebar.html" xlink:title="Connection_Sidebar" target="_parent">
 <polygon fill="none" stroke="black" points="356,-268 218,-268 218,-232 356,-232 356,-268"/>
 <text text-anchor="middle" x="287" y="-246.6" font-family="Courier,monospace" font-size="11.00">Connection_Sidebar</text>
 </a>
 </g>
 <!-- \\wxPanel -->
-<g id="node11" class="node"><title>\\wxPanel</title>
+<g id="node13" class="node"><title>\\wxPanel</title>
 <ellipse fill="none" stroke="black" cx="73" cy="-250" rx="53.1641" ry="18"/>
 <text text-anchor="middle" x="73" y="-245.4" font-family="Times Roman,serif" font-size="14.00" fill="gray">\wxPanel</text>
 </g>
@@ -54,68 +68,68 @@
 <path fill="none" stroke="black" d="M217.816,-250C191.842,-250 162.457,-250 136.977,-250"/>
 <polygon fill="none" stroke="black" points="136.687,-246.5 126.687,-250 136.687,-253.5 136.687,-246.5"/>
 </g>
-<!-- \\OpenSQLManager\\Connection_Manager -->
-<g id="node4" class="node"><title>\\OpenSQLManager\\Connection_Manager</title>
-<a xlink:href="sys.widgets.connection_manager.html" xlink:title="Connection_Manager" target="_parent">
-<polygon fill="none" stroke="black" points="356,-214 218,-214 218,-178 356,-178 356,-214"/>
-<text text-anchor="middle" x="287" y="-192.6" font-family="Courier,monospace" font-size="11.00">Connection_Manager</text>
-</a>
-</g>
-<!-- \\wxFrame -->
-<g id="node13" class="node"><title>\\wxFrame</title>
-<ellipse fill="none" stroke="black" cx="73" cy="-169" rx="57.1889" ry="18"/>
-<text text-anchor="middle" x="73" y="-164.4" font-family="Times Roman,serif" font-size="14.00" fill="gray">\wxFrame</text>
-</g>
-<!-- \\OpenSQLManager\\Connection_Manager&#45;&gt;\\wxFrame -->
-<g id="edge7" class="edge"><title>\\OpenSQLManager\\Connection_Manager&#45;&gt;\\wxFrame</title>
-<path fill="none" stroke="black" d="M217.816,-187.271C191.619,-183.966 161.952,-180.223 136.321,-176.989"/>
-<polygon fill="none" stroke="black" points="136.705,-173.51 126.345,-175.73 135.829,-180.455 136.705,-173.51"/>
-</g>
 <!-- \\OpenSQLManager\\Data_Grid -->
-<g id="node5" class="node"><title>\\OpenSQLManager\\Data_Grid</title>
+<g id="node6" class="node"><title>\\OpenSQLManager\\Data_Grid</title>
 <a xlink:href="sys.widgets.data_grid.html" xlink:title="Data_Grid" target="_parent">
-<polygon fill="none" stroke="black" points="325,-106 249,-106 249,-70 325,-70 325,-106"/>
-<text text-anchor="middle" x="287" y="-84.6" font-family="Courier,monospace" font-size="11.00">Data_Grid</text>
+<polygon fill="none" stroke="black" points="325,-214 249,-214 249,-178 325,-178 325,-214"/>
+<text text-anchor="middle" x="287" y="-192.6" font-family="Courier,monospace" font-size="11.00">Data_Grid</text>
 </a>
 </g>
 <!-- \\wxGrid -->
 <g id="node15" class="node"><title>\\wxGrid</title>
-<ellipse fill="none" stroke="black" cx="73" cy="-88" rx="47.1269" ry="18"/>
-<text text-anchor="middle" x="73" y="-83.4" font-family="Times Roman,serif" font-size="14.00" fill="gray">\wxGrid</text>
+<ellipse fill="none" stroke="black" cx="73" cy="-196" rx="47.1269" ry="18"/>
+<text text-anchor="middle" x="73" y="-191.4" font-family="Times Roman,serif" font-size="14.00" fill="gray">\wxGrid</text>
 </g>
 <!-- \\OpenSQLManager\\Data_Grid&#45;&gt;\\wxGrid -->
-<g id="edge9" class="edge"><title>\\OpenSQLManager\\Data_Grid&#45;&gt;\\wxGrid</title>
-<path fill="none" stroke="black" d="M248.246,-88C215.548,-88 168.255,-88 131.039,-88"/>
-<polygon fill="none" stroke="black" points="130.829,-84.5001 120.829,-88 130.829,-91.5001 130.829,-84.5001"/>
+<g id="edge7" class="edge"><title>\\OpenSQLManager\\Data_Grid&#45;&gt;\\wxGrid</title>
+<path fill="none" stroke="black" d="M248.246,-196C215.548,-196 168.255,-196 131.039,-196"/>
+<polygon fill="none" stroke="black" points="130.829,-192.5 120.829,-196 130.829,-199.5 130.829,-192.5"/>
 </g>
 <!-- \\OpenSQLManager\\DB_tabs -->
-<g id="node6" class="node"><title>\\OpenSQLManager\\DB_tabs</title>
+<g id="node7" class="node"><title>\\OpenSQLManager\\DB_tabs</title>
 <a xlink:href="sys.widgets.db_tabs.html" xlink:title="DB_tabs" target="_parent">
-<polygon fill="none" stroke="black" points="319,-52 255,-52 255,-16 319,-16 319,-52"/>
-<text text-anchor="middle" x="287" y="-30.6" font-family="Courier,monospace" font-size="11.00">DB_tabs</text>
+<polygon fill="none" stroke="black" points="319,-160 255,-160 255,-124 319,-124 319,-160"/>
+<text text-anchor="middle" x="287" y="-138.6" font-family="Courier,monospace" font-size="11.00">DB_tabs</text>
 </a>
 </g>
 <!-- \\wxNotebook -->
 <g id="node17" class="node"><title>\\wxNotebook</title>
-<ellipse fill="none" stroke="black" cx="73" cy="-34" rx="73.1194" ry="18"/>
-<text text-anchor="middle" x="73" y="-29.4" font-family="Times Roman,serif" font-size="14.00" fill="gray">\wxNotebook</text>
+<ellipse fill="none" stroke="black" cx="73" cy="-142" rx="73.1194" ry="18"/>
+<text text-anchor="middle" x="73" y="-137.4" font-family="Times Roman,serif" font-size="14.00" fill="gray">\wxNotebook</text>
 </g>
 <!-- \\OpenSQLManager\\DB_tabs&#45;&gt;\\wxNotebook -->
-<g id="edge11" class="edge"><title>\\OpenSQLManager\\DB_tabs&#45;&gt;\\wxNotebook</title>
-<path fill="none" stroke="black" d="M254.962,-34C228.856,-34 190.785,-34 156.206,-34"/>
-<polygon fill="none" stroke="black" points="156.083,-30.5001 146.083,-34 156.083,-37.5001 156.083,-30.5001"/>
+<g id="edge9" class="edge"><title>\\OpenSQLManager\\DB_tabs&#45;&gt;\\wxNotebook</title>
+<path fill="none" stroke="black" d="M254.962,-142C228.856,-142 190.785,-142 156.206,-142"/>
+<polygon fill="none" stroke="black" points="156.083,-138.5 146.083,-142 156.083,-145.5 156.083,-138.5"/>
+</g>
+<!-- \\OpenSQLManager\\Connection_Manager -->
+<g id="node8" class="node"><title>\\OpenSQLManager\\Connection_Manager</title>
+<a xlink:href="sys.windows.connection_manager.html" xlink:title="Connection_Manager" target="_parent">
+<polygon fill="none" stroke="black" points="356,-106 218,-106 218,-70 356,-70 356,-106"/>
+<text text-anchor="middle" x="287" y="-84.6" font-family="Courier,monospace" font-size="11.00">Connection_Manager</text>
+</a>
+</g>
+<!-- \\wxFrame -->
+<g id="node19" class="node"><title>\\wxFrame</title>
+<ellipse fill="none" stroke="black" cx="73" cy="-61" rx="57.1889" ry="18"/>
+<text text-anchor="middle" x="73" y="-56.4" font-family="Times Roman,serif" font-size="14.00" fill="gray">\wxFrame</text>
+</g>
+<!-- \\OpenSQLManager\\Connection_Manager&#45;&gt;\\wxFrame -->
+<g id="edge11" class="edge"><title>\\OpenSQLManager\\Connection_Manager&#45;&gt;\\wxFrame</title>
+<path fill="none" stroke="black" d="M217.816,-79.2712C191.619,-75.966 161.952,-72.2229 136.321,-68.9891"/>
+<polygon fill="none" stroke="black" points="136.705,-65.5099 126.345,-67.7305 135.829,-72.4548 136.705,-65.5099"/>
 </g>
 <!-- \\OpenSQLManager\\Main -->
-<g id="node7" class="node"><title>\\OpenSQLManager\\Main</title>
+<g id="node9" class="node"><title>\\OpenSQLManager\\Main</title>
 <a xlink:href="sys.windows.main.html" xlink:title="Main" target="_parent">
-<polygon fill="none" stroke="black" points="314,-160 260,-160 260,-124 314,-124 314,-160"/>
-<text text-anchor="middle" x="287" y="-138.6" font-family="Courier,monospace" font-size="11.00">Main</text>
+<polygon fill="none" stroke="black" points="314,-52 260,-52 260,-16 314,-16 314,-52"/>
+<text text-anchor="middle" x="287" y="-30.6" font-family="Courier,monospace" font-size="11.00">Main</text>
 </a>
 </g>
 <!-- \\OpenSQLManager\\Main&#45;&gt;\\wxFrame -->
 <g id="edge13" class="edge"><title>\\OpenSQLManager\\Main&#45;&gt;\\wxFrame</title>
-<path fill="none" stroke="black" d="M259.897,-145.42C229.038,-149.313 177.58,-155.805 136.463,-160.993"/>
-<polygon fill="none" stroke="black" points="136.003,-157.523 126.52,-162.247 136.88,-164.468 136.003,-157.523"/>
+<path fill="none" stroke="black" d="M259.897,-37.4196C229.038,-41.313 177.58,-47.8054 136.463,-52.993"/>
+<polygon fill="none" stroke="black" points="136.003,-49.5231 126.52,-54.2474 136.88,-56.4681 136.003,-49.5231"/>
 </g>
 </g>
 </svg>
diff --git a/docs/classes/OpenSQLManager.Connection_Manager.html b/docs/classes/OpenSQLManager.Connection_Manager.html
index 1444aa1..6b28745 100644
--- a/docs/classes/OpenSQLManager.Connection_Manager.html
+++ b/docs/classes/OpenSQLManager.Connection_Manager.html
@@ -22,6 +22,7 @@
 <li><a>Packages</a></li>
 <li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
 <li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
 </ul>
 </li>
 <li class="dropdown" id="charts-menu">
@@ -200,7 +201,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-30T16:45:45-04:00.<br></footer></div>
+            generated on 2012-05-31T09:56:04-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/OpenSQLManager.Connection_Sidebar.html b/docs/classes/OpenSQLManager.Connection_Sidebar.html
index a084c06..d261600 100644
--- a/docs/classes/OpenSQLManager.Connection_Sidebar.html
+++ b/docs/classes/OpenSQLManager.Connection_Sidebar.html
@@ -22,6 +22,7 @@
 <li><a>Packages</a></li>
 <li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
 <li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
 </ul>
 </li>
 <li class="dropdown" id="charts-menu">
@@ -177,7 +178,7 @@
 </div>
 <a name="%24settings" id="$settings"> </a><div class="element clickable property protected $settings" data-toggle="collapse" data-target=".$settings .collapse">
 <h2>Reference to Settings instance</h2>
-<pre>$settings : \OpenSQLManager\Settings</pre>
+<pre>$settings : <a href="../classes/OpenSQLManager.Settings.html">\OpenSQLManager\Settings</a></pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
@@ -238,7 +239,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-30T16:45:45-04:00.<br></footer></div>
+            generated on 2012-05-31T09:56:04-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/OpenSQLManager.DB_Reg.html b/docs/classes/OpenSQLManager.DB_Reg.html
new file mode 100644
index 0000000..edeebcf
--- /dev/null
+++ b/docs/classes/OpenSQLManager.DB_Reg.html
@@ -0,0 +1,167 @@
+<!DOCTYPE html><html xmlns:date="http://exslt.org/dates-and-times" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
+<meta charset="utf-8">
+<title>OpenSQLManager » \OpenSQLManager\DB_Reg</title>
+<meta name="author" content="Mike van Riel">
+<meta name="description" content="">
+<link href="../css/template.css" rel="stylesheet" media="all">
+<script src="../js/jquery-1.7.1.min.js" type="text/javascript"></script><script src="../js/jquery-ui-1.8.2.custom.min.js" type="text/javascript"></script><script src="../js/jquery.mousewheel.min.js" type="text/javascript"></script><script src="../js/bootstrap.js" type="text/javascript"></script><script src="../js/template.js" type="text/javascript"></script><script src="../js/prettify/prettify.min.js" type="text/javascript"></script><link rel="shortcut icon" href="../img/favicon.ico">
+<link rel="apple-touch-icon" href="../img/apple-touch-icon.png">
+<link rel="apple-touch-icon" sizes="72x72" href="../img/apple-touch-icon-72x72.png">
+<link rel="apple-touch-icon" sizes="114x114" href="../img/apple-touch-icon-114x114.png">
+</head>
+<body>
+<div class="navbar navbar-fixed-top">
+<div class="navbar-inner"><div class="container">
+<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
+<li class="dropdown">
+<a href="#api" class="dropdown-toggle" data-toggle="dropdown">
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
+</li>
+<li class="dropdown" id="charts-menu">
+<a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
+                                    Charts <b class="caret"></b></a><ul class="dropdown-menu"><li><a href="../graph_class.html"><i class="icon-list-alt"></i> Class hierarchy diagram</a></li></ul>
+</li>
+<li class="dropdown" id="reports-menu">
+<a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
+                                    Reports <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
+                <span class="label label-info">0</span></a></li>
+<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
+                <ul></ul></a></li>
+<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
+                <span class="label label-info">0</span></a></li>
+</ul>
+</li>
+</ul></div>
+</div></div>
+<div class="go_to_top"><a href="#___" style="color: inherit">Back to top  <i class="icon-upload icon-white"></i></a></div>
+</div>
+<div id="___" class="container">
+<noscript><div class="alert alert-warning">
+                            Javascript is disabled; several features are only available
+                            if Javascript is enabled.
+                        </div></noscript>
+<div class="row">
+<div class="span4">
+<span class="btn-group visibility" data-toggle="buttons-checkbox"><button class="btn public active" title="Show public elements">Public</button><button class="btn protected" title="Show protected elements">Protected</button><button class="btn private" title="Show private elements">Private</button><button class="btn inherited active" title="Show inherited elements">Inherited</button></span><div class="btn-group view pull-right" data-toggle="buttons-radio">
+<button class="btn details" title="Show descriptions and method names"><i class="icon-list"></i></button><button class="btn simple" title="Show only method names"><i class="icon-align-justify"></i></button>
+</div>
+<ul class="side-nav nav nav-list">
+<li class="nav-header">
+<i class="icon-custom icon-method"></i> Methods</li>
+<li class="method public "><a href="#get_connections" title="get_connections :: Return exiting connections"><span class="description">Return exiting connections</span><pre>get_connections()</pre></a></li>
+<li class="method public "><a href="#get_db" title="get_db :: Registry access method"><span class="description">Registry access method</span><pre>get_db()</pre></a></li>
+<li class="method public "><a href="#remove_db" title="remove_db :: Remove a database connection"><span class="description">Remove a database connection</span><pre>remove_db()</pre></a></li>
+<li class="nav-header private">» Private</li>
+<li class="method private "><a href="#__construct" title="__construct :: Private constructor"><span class="description">Private constructor</span><pre>__construct()</pre></a></li>
+<li class="nav-header">
+<i class="icon-custom icon-property"></i> Properties</li>
+<li class="nav-header private">» Private</li>
+<li class="property private "><a href="#%24instance" title="$instance :: Static array of connections"><span class="description">Static array of connections</span><pre>$instance</pre></a></li>
+</ul>
+</div>
+<div class="span8">
+<a name="%5COpenSQLManager%5CDB_Reg" id="\OpenSQLManager\DB_Reg"></a><ul class="breadcrumb">
+<li>
+<a href="../index.html"><i class="icon-custom icon-class"></i></a><span class="divider">\</span>
+</li>
+<li><a href="../namespaces/OpenSQLManager.html">OpenSQLManager</a></li>
+<li class="active">
+<span class="divider">\</span><a href="../classes/OpenSQLManager.DB_Reg.html">DB_Reg</a>
+</li>
+</ul>
+<div href="../classes/OpenSQLManager.DB_Reg.html" class="element class">
+<p class="short_description">Connection registry</p>
+<div class="details">
+<p class="long_description"><p>Decouples the Settings class from the query builder
+and organizes database connections</p></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Helper%20Classes.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Helper Classes</td>
+</tr>
+</table>
+<h3>
+<i class="icon-custom icon-method"></i> Methods</h3>
+<a name="get_connections" id="get_connections"></a><div class="element clickable method public get_connections" data-toggle="collapse" data-target=".get_connections .collapse">
+<h2>Return exiting connections</h2>
+<pre>get_connections() : array</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Returns</h3>
+<div class="subelement response"><code>array</code></div>
+</div></div>
+</div>
+<a name="get_db" id="get_db"></a><div class="element clickable method public get_db" data-toggle="collapse" data-target=".get_db .collapse">
+<h2>Registry access method</h2>
+<pre>get_db(string $key) : object</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$key</h4>
+<code>string</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>object</code></div>
+</div></div>
+</div>
+<a name="remove_db" id="remove_db"></a><div class="element clickable method public remove_db" data-toggle="collapse" data-target=".remove_db .collapse">
+<h2>Remove a database connection</h2>
+<pre>remove_db(string $key) : void</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$key</h4>
+<code>string</code>
+</div>
+</div></div>
+</div>
+<a name="__construct" id="__construct"></a><div class="element clickable method private __construct" data-toggle="collapse" data-target=".__construct .collapse">
+<h2>Private constructor</h2>
+<pre>__construct(string $key) </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$key</h4>
+<code>string</code>
+</div>
+</div></div>
+</div>
+<h3>
+<i class="icon-custom icon-property"></i> Properties</h3>
+<a name="%24instance" id="$instance"> </a><div class="element clickable property private $instance" data-toggle="collapse" data-target=".$instance .collapse">
+<h2>Static array of connections</h2>
+<pre>$instance </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="row"><footer class="span12">
+            Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
+            Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
+            generated on 2012-05-31T09:56:04-04:00.<br></footer></div>
+</div>
+</body>
+</html>
diff --git a/docs/classes/OpenSQLManager.DB_tabs.html b/docs/classes/OpenSQLManager.DB_tabs.html
index 37ccd1f..57b11b6 100644
--- a/docs/classes/OpenSQLManager.DB_tabs.html
+++ b/docs/classes/OpenSQLManager.DB_tabs.html
@@ -22,6 +22,7 @@
 <li><a>Packages</a></li>
 <li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
 <li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
 </ul>
 </li>
 <li class="dropdown" id="charts-menu">
@@ -146,7 +147,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-30T16:45:45-04:00.<br></footer></div>
+            generated on 2012-05-31T09:56:04-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/OpenSQLManager.Data_Grid.html b/docs/classes/OpenSQLManager.Data_Grid.html
index 1fe68d0..fc7e836 100644
--- a/docs/classes/OpenSQLManager.Data_Grid.html
+++ b/docs/classes/OpenSQLManager.Data_Grid.html
@@ -22,6 +22,7 @@
 <li><a>Packages</a></li>
 <li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
 <li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
 </ul>
 </li>
 <li class="dropdown" id="charts-menu">
@@ -104,7 +105,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-30T16:45:45-04:00.<br></footer></div>
+            generated on 2012-05-31T09:56:04-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/OpenSQLManager.Main.html b/docs/classes/OpenSQLManager.Main.html
index 9987b7b..059425d 100644
--- a/docs/classes/OpenSQLManager.Main.html
+++ b/docs/classes/OpenSQLManager.Main.html
@@ -22,6 +22,7 @@
 <li><a>Packages</a></li>
 <li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
 <li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
 </ul>
 </li>
 <li class="dropdown" id="charts-menu">
@@ -157,7 +158,7 @@ Create menus, hboxes, vboxs and other widgets</h2>
 </div>
 <a name="%24settings" id="$settings"> </a><div class="element clickable property private $settings" data-toggle="collapse" data-target=".$settings .collapse">
 <h2>Reference to settings instance</h2>
-<pre>$settings : \OpenSQLManager\Settings</pre>
+<pre>$settings : <a href="../classes/OpenSQLManager.Settings.html">\OpenSQLManager\Settings</a></pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
@@ -168,7 +169,7 @@ Create menus, hboxes, vboxs and other widgets</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-30T16:45:45-04:00.<br></footer></div>
+            generated on 2012-05-31T09:56:04-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/OpenSQLManager.OpenSQLManager.html b/docs/classes/OpenSQLManager.OpenSQLManager.html
index 39336c2..64578ee 100644
--- a/docs/classes/OpenSQLManager.OpenSQLManager.html
+++ b/docs/classes/OpenSQLManager.OpenSQLManager.html
@@ -22,6 +22,7 @@
 <li><a>Packages</a></li>
 <li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
 <li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
 </ul>
 </li>
 <li class="dropdown" id="charts-menu">
@@ -107,7 +108,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-30T16:45:45-04:00.<br></footer></div>
+            generated on 2012-05-31T09:56:04-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/OpenSQLManager.Settings.html b/docs/classes/OpenSQLManager.Settings.html
new file mode 100644
index 0000000..b3c2218
--- /dev/null
+++ b/docs/classes/OpenSQLManager.Settings.html
@@ -0,0 +1,259 @@
+<!DOCTYPE html><html xmlns:date="http://exslt.org/dates-and-times" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
+<meta charset="utf-8">
+<title>OpenSQLManager » \OpenSQLManager\Settings</title>
+<meta name="author" content="Mike van Riel">
+<meta name="description" content="">
+<link href="../css/template.css" rel="stylesheet" media="all">
+<script src="../js/jquery-1.7.1.min.js" type="text/javascript"></script><script src="../js/jquery-ui-1.8.2.custom.min.js" type="text/javascript"></script><script src="../js/jquery.mousewheel.min.js" type="text/javascript"></script><script src="../js/bootstrap.js" type="text/javascript"></script><script src="../js/template.js" type="text/javascript"></script><script src="../js/prettify/prettify.min.js" type="text/javascript"></script><link rel="shortcut icon" href="../img/favicon.ico">
+<link rel="apple-touch-icon" href="../img/apple-touch-icon.png">
+<link rel="apple-touch-icon" sizes="72x72" href="../img/apple-touch-icon-72x72.png">
+<link rel="apple-touch-icon" sizes="114x114" href="../img/apple-touch-icon-114x114.png">
+</head>
+<body>
+<div class="navbar navbar-fixed-top">
+<div class="navbar-inner"><div class="container">
+<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
+<li class="dropdown">
+<a href="#api" class="dropdown-toggle" data-toggle="dropdown">
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
+</li>
+<li class="dropdown" id="charts-menu">
+<a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
+                                    Charts <b class="caret"></b></a><ul class="dropdown-menu"><li><a href="../graph_class.html"><i class="icon-list-alt"></i> Class hierarchy diagram</a></li></ul>
+</li>
+<li class="dropdown" id="reports-menu">
+<a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
+                                    Reports <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
+                <span class="label label-info">0</span></a></li>
+<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
+                <ul></ul></a></li>
+<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
+                <span class="label label-info">0</span></a></li>
+</ul>
+</li>
+</ul></div>
+</div></div>
+<div class="go_to_top"><a href="#___" style="color: inherit">Back to top  <i class="icon-upload icon-white"></i></a></div>
+</div>
+<div id="___" class="container">
+<noscript><div class="alert alert-warning">
+                            Javascript is disabled; several features are only available
+                            if Javascript is enabled.
+                        </div></noscript>
+<div class="row">
+<div class="span4">
+<span class="btn-group visibility" data-toggle="buttons-checkbox"><button class="btn public active" title="Show public elements">Public</button><button class="btn protected" title="Show protected elements">Protected</button><button class="btn private" title="Show private elements">Private</button><button class="btn inherited active" title="Show inherited elements">Inherited</button></span><div class="btn-group view pull-right" data-toggle="buttons-radio">
+<button class="btn details" title="Show descriptions and method names"><i class="icon-list"></i></button><button class="btn simple" title="Show only method names"><i class="icon-align-justify"></i></button>
+</div>
+<ul class="side-nav nav nav-list">
+<li class="nav-header">
+<i class="icon-custom icon-method"></i> Methods</li>
+<li class="method public "><a href="#__destruct" title="__destruct :: Output the settings on destruct"><span class="description">Output the settings on destruct</span><pre>__destruct()</pre></a></li>
+<li class="method public "><a href="#__get" title="__get :: Magic method to simplify isset checking for config options"><span class="description">Magic method to simplify isset checking for config options</span><pre>__get()</pre></a></li>
+<li class="method public "><a href="#__set" title="__set :: Magic method to simplify setting config options"><span class="description">Magic method to simplify setting config options</span><pre>__set()</pre></a></li>
+<li class="method public "><a href="#add_db" title="add_db :: Add a database connection"><span class="description">Add a database connection</span><pre>add_db()</pre></a></li>
+<li class="method public "><a href="#edit_db" title="edit_db :: Edit a database connection"><span class="description">Edit a database connection</span><pre>edit_db()</pre></a></li>
+<li class="method public "><a href="#get_db" title="get_db :: Retreive a specific database connection"><span class="description">Retreive a specific database connection</span><pre>get_db()</pre></a></li>
+<li class="method public "><a href="#get_dbs" title="get_dbs :: Retreive all db connections"><span class="description">Retreive all db connections</span><pre>get_dbs()</pre></a></li>
+<li class="method public "><a href="#get_instance" title="get_instance :: Static method to retreive current instance
+of the singleton"><span class="description">Static method to retreive current instance
+of the singleton</span><pre>get_instance()</pre></a></li>
+<li class="method public "><a href="#remove_db" title="remove_db :: Remove a database connection"><span class="description">Remove a database connection</span><pre>remove_db()</pre></a></li>
+<li class="nav-header private">» Private</li>
+<li class="method private "><a href="#__construct" title="__construct :: Load the settings file - private so it can't be loaded
+directly - the settings should be safe!"><span class="description">Load the settings file - private so it can't be loaded
+directly - the settings should be safe!</span><pre>__construct()</pre></a></li>
+<li class="nav-header">
+<i class="icon-custom icon-property"></i> Properties</li>
+<li class="nav-header private">» Private</li>
+<li class="property private "><a href="#%24current" title="$current :: Settings object represented by the currently loaded JSON file"><span class="description">Settings object represented by the currently loaded JSON file</span><pre>$current</pre></a></li>
+<li class="property private "><a href="#%24instance" title="$instance :: Singleton instance"><span class="description">Singleton instance</span><pre>$instance</pre></a></li>
+</ul>
+</div>
+<div class="span8">
+<a name="%5COpenSQLManager%5CSettings" id="\OpenSQLManager\Settings"></a><ul class="breadcrumb">
+<li>
+<a href="../index.html"><i class="icon-custom icon-class"></i></a><span class="divider">\</span>
+</li>
+<li><a href="../namespaces/OpenSQLManager.html">OpenSQLManager</a></li>
+<li class="active">
+<span class="divider">\</span><a href="../classes/OpenSQLManager.Settings.html">Settings</a>
+</li>
+</ul>
+<div href="../classes/OpenSQLManager.Settings.html" class="element class">
+<p class="short_description">Class for manipulating datbase connections, and miscellaneous settings</p>
+<div class="details">
+<p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Helper%20Classes.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Helper Classes</td>
+</tr>
+</table>
+<h3>
+<i class="icon-custom icon-method"></i> Methods</h3>
+<a name="__destruct" id="__destruct"></a><div class="element clickable method public __destruct" data-toggle="collapse" data-target=".__destruct .collapse">
+<h2>Output the settings on destruct</h2>
+<pre>__destruct() </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
+</div>
+<a name="__get" id="__get"></a><div class="element clickable method public __get" data-toggle="collapse" data-target=".__get .collapse">
+<h2>Magic method to simplify isset checking for config options</h2>
+<pre>__get(string $key) : mixed</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$key</h4>
+<code>string</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>mixed</code></div>
+</div></div>
+</div>
+<a name="__set" id="__set"></a><div class="element clickable method public __set" data-toggle="collapse" data-target=".__set .collapse">
+<h2>Magic method to simplify setting config options</h2>
+<pre>__set(string $key, $val) </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$key</h4>
+<code>string</code>
+</div>
+<div class="subelement argument">
+<h4>$val</h4>
+<code></code><p>mixed</p></div>
+</div></div>
+</div>
+<a name="add_db" id="add_db"></a><div class="element clickable method public add_db" data-toggle="collapse" data-target=".add_db .collapse">
+<h2>Add a database connection</h2>
+<pre>add_db(string $name, array $params) </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$name</h4>
+<code>string</code>
+</div>
+<div class="subelement argument">
+<h4>$params</h4>
+<code>array</code>
+</div>
+</div></div>
+</div>
+<a name="edit_db" id="edit_db"></a><div class="element clickable method public edit_db" data-toggle="collapse" data-target=".edit_db .collapse">
+<h2>Edit a database connection</h2>
+<pre>edit_db(string $name, array $params) </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$name</h4>
+<code>string</code>
+</div>
+<div class="subelement argument">
+<h4>$params</h4>
+<code>array</code>
+</div>
+</div></div>
+</div>
+<a name="get_db" id="get_db"></a><div class="element clickable method public get_db" data-toggle="collapse" data-target=".get_db .collapse">
+<h2>Retreive a specific database connection</h2>
+<pre>get_db(string $name) : object</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$name</h4>
+<code>string</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>object</code></div>
+</div></div>
+</div>
+<a name="get_dbs" id="get_dbs"></a><div class="element clickable method public get_dbs" data-toggle="collapse" data-target=".get_dbs .collapse">
+<h2>Retreive all db connections</h2>
+<pre>get_dbs() : array</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Returns</h3>
+<div class="subelement response"><code>array</code></div>
+</div></div>
+</div>
+<a name="get_instance" id="get_instance"></a><div class="element clickable method public get_instance" data-toggle="collapse" data-target=".get_instance .collapse">
+<h2>Static method to retreive current instance
+of the singleton</h2>
+<pre>get_instance() : <a href="../classes/OpenSQLManager.Settings.html">\OpenSQLManager\Settings</a></pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Returns</h3>
+<div class="subelement response"><code><a href="../classes/OpenSQLManager.Settings.html">\OpenSQLManager\Settings</a></code></div>
+</div></div>
+</div>
+<a name="remove_db" id="remove_db"></a><div class="element clickable method public remove_db" data-toggle="collapse" data-target=".remove_db .collapse">
+<h2>Remove a database connection</h2>
+<pre>remove_db(string $name) </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$name</h4>
+<code>string</code>
+</div>
+</div></div>
+</div>
+<a name="__construct" id="__construct"></a><div class="element clickable method private __construct" data-toggle="collapse" data-target=".__construct .collapse">
+<h2>Load the settings file - private so it can't be loaded
+directly - the settings should be safe!</h2>
+<pre>__construct() </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
+</div>
+<h3>
+<i class="icon-custom icon-property"></i> Properties</h3>
+<a name="%24current" id="$current"> </a><div class="element clickable property private $current" data-toggle="collapse" data-target=".$current .collapse">
+<h2>Settings object represented by the currently loaded JSON file</h2>
+<pre>$current </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
+</div>
+<a name="%24instance" id="$instance"> </a><div class="element clickable property private $instance" data-toggle="collapse" data-target=".$instance .collapse">
+<h2>Singleton instance</h2>
+<pre>$instance </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="row"><footer class="span12">
+            Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
+            Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
+            generated on 2012-05-31T09:56:04-04:00.<br></footer></div>
+</div>
+</body>
+</html>
diff --git a/docs/classes/OpensSQLManager.Settings.html b/docs/classes/OpensSQLManager.Settings.html
new file mode 100644
index 0000000..af9df0e
--- /dev/null
+++ b/docs/classes/OpensSQLManager.Settings.html
@@ -0,0 +1,259 @@
+<!DOCTYPE html><html xmlns:date="http://exslt.org/dates-and-times" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
+<meta charset="utf-8">
+<title>OpenSQLManager » \OpensSQLManager\Settings</title>
+<meta name="author" content="Mike van Riel">
+<meta name="description" content="">
+<link href="../css/template.css" rel="stylesheet" media="all">
+<script src="../js/jquery-1.7.1.min.js" type="text/javascript"></script><script src="../js/jquery-ui-1.8.2.custom.min.js" type="text/javascript"></script><script src="../js/jquery.mousewheel.min.js" type="text/javascript"></script><script src="../js/bootstrap.js" type="text/javascript"></script><script src="../js/template.js" type="text/javascript"></script><script src="../js/prettify/prettify.min.js" type="text/javascript"></script><link rel="shortcut icon" href="../img/favicon.ico">
+<link rel="apple-touch-icon" href="../img/apple-touch-icon.png">
+<link rel="apple-touch-icon" sizes="72x72" href="../img/apple-touch-icon-72x72.png">
+<link rel="apple-touch-icon" sizes="114x114" href="../img/apple-touch-icon-114x114.png">
+</head>
+<body>
+<div class="navbar navbar-fixed-top">
+<div class="navbar-inner"><div class="container">
+<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
+<li class="dropdown">
+<a href="#api" class="dropdown-toggle" data-toggle="dropdown">
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
+</li>
+<li class="dropdown" id="charts-menu">
+<a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
+                                    Charts <b class="caret"></b></a><ul class="dropdown-menu"><li><a href="../graph_class.html"><i class="icon-list-alt"></i> Class hierarchy diagram</a></li></ul>
+</li>
+<li class="dropdown" id="reports-menu">
+<a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
+                                    Reports <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
+                <span class="label label-info">0</span></a></li>
+<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
+                <ul></ul></a></li>
+<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
+                <span class="label label-info">0</span></a></li>
+</ul>
+</li>
+</ul></div>
+</div></div>
+<div class="go_to_top"><a href="#___" style="color: inherit">Back to top  <i class="icon-upload icon-white"></i></a></div>
+</div>
+<div id="___" class="container">
+<noscript><div class="alert alert-warning">
+                            Javascript is disabled; several features are only available
+                            if Javascript is enabled.
+                        </div></noscript>
+<div class="row">
+<div class="span4">
+<span class="btn-group visibility" data-toggle="buttons-checkbox"><button class="btn public active" title="Show public elements">Public</button><button class="btn protected" title="Show protected elements">Protected</button><button class="btn private" title="Show private elements">Private</button><button class="btn inherited active" title="Show inherited elements">Inherited</button></span><div class="btn-group view pull-right" data-toggle="buttons-radio">
+<button class="btn details" title="Show descriptions and method names"><i class="icon-list"></i></button><button class="btn simple" title="Show only method names"><i class="icon-align-justify"></i></button>
+</div>
+<ul class="side-nav nav nav-list">
+<li class="nav-header">
+<i class="icon-custom icon-method"></i> Methods</li>
+<li class="method public "><a href="#__destruct" title="__destruct :: Output the settings on destruct"><span class="description">Output the settings on destruct</span><pre>__destruct()</pre></a></li>
+<li class="method public "><a href="#__get" title="__get :: Magic method to simplify isset checking for config options"><span class="description">Magic method to simplify isset checking for config options</span><pre>__get()</pre></a></li>
+<li class="method public "><a href="#__set" title="__set :: Magic method to simplify setting config options"><span class="description">Magic method to simplify setting config options</span><pre>__set()</pre></a></li>
+<li class="method public "><a href="#add_db" title="add_db :: Add a database connection"><span class="description">Add a database connection</span><pre>add_db()</pre></a></li>
+<li class="method public "><a href="#edit_db" title="edit_db :: Edit a database connection"><span class="description">Edit a database connection</span><pre>edit_db()</pre></a></li>
+<li class="method public "><a href="#get_db" title="get_db :: Retreive a specific database connection"><span class="description">Retreive a specific database connection</span><pre>get_db()</pre></a></li>
+<li class="method public "><a href="#get_dbs" title="get_dbs :: Retreive all db connections"><span class="description">Retreive all db connections</span><pre>get_dbs()</pre></a></li>
+<li class="method public "><a href="#get_instance" title="get_instance :: Static method to retreive current instance
+of the singleton"><span class="description">Static method to retreive current instance
+of the singleton</span><pre>get_instance()</pre></a></li>
+<li class="method public "><a href="#remove_db" title="remove_db :: Remove a database connection"><span class="description">Remove a database connection</span><pre>remove_db()</pre></a></li>
+<li class="nav-header private">» Private</li>
+<li class="method private "><a href="#__construct" title="__construct :: Load the settings file - private so it can't be loaded
+directly - the settings should be safe!"><span class="description">Load the settings file - private so it can't be loaded
+directly - the settings should be safe!</span><pre>__construct()</pre></a></li>
+<li class="nav-header">
+<i class="icon-custom icon-property"></i> Properties</li>
+<li class="nav-header private">» Private</li>
+<li class="property private "><a href="#%24current" title="$current :: Settings object represented by the currently loaded JSON file"><span class="description">Settings object represented by the currently loaded JSON file</span><pre>$current</pre></a></li>
+<li class="property private "><a href="#%24instance" title="$instance :: Singleton instance"><span class="description">Singleton instance</span><pre>$instance</pre></a></li>
+</ul>
+</div>
+<div class="span8">
+<a name="%5COpensSQLManager%5CSettings" id="\OpensSQLManager\Settings"></a><ul class="breadcrumb">
+<li>
+<a href="../index.html"><i class="icon-custom icon-class"></i></a><span class="divider">\</span>
+</li>
+<li><a href="../namespaces/OpensSQLManager.html">OpensSQLManager</a></li>
+<li class="active">
+<span class="divider">\</span><a href="../classes/OpensSQLManager.Settings.html">Settings</a>
+</li>
+</ul>
+<div href="../classes/OpensSQLManager.Settings.html" class="element class">
+<p class="short_description">Class for manipulating datbase connections, and miscellaneous settings</p>
+<div class="details">
+<p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Helper%20Classes.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Helper Classes</td>
+</tr>
+</table>
+<h3>
+<i class="icon-custom icon-method"></i> Methods</h3>
+<a name="__destruct" id="__destruct"></a><div class="element clickable method public __destruct" data-toggle="collapse" data-target=".__destruct .collapse">
+<h2>Output the settings on destruct</h2>
+<pre>__destruct() </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
+</div>
+<a name="__get" id="__get"></a><div class="element clickable method public __get" data-toggle="collapse" data-target=".__get .collapse">
+<h2>Magic method to simplify isset checking for config options</h2>
+<pre>__get(string $key) : mixed</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$key</h4>
+<code>string</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>mixed</code></div>
+</div></div>
+</div>
+<a name="__set" id="__set"></a><div class="element clickable method public __set" data-toggle="collapse" data-target=".__set .collapse">
+<h2>Magic method to simplify setting config options</h2>
+<pre>__set(string $key, $val) </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$key</h4>
+<code>string</code>
+</div>
+<div class="subelement argument">
+<h4>$val</h4>
+<code></code><p>mixed</p></div>
+</div></div>
+</div>
+<a name="add_db" id="add_db"></a><div class="element clickable method public add_db" data-toggle="collapse" data-target=".add_db .collapse">
+<h2>Add a database connection</h2>
+<pre>add_db(string $name, array $params) </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$name</h4>
+<code>string</code>
+</div>
+<div class="subelement argument">
+<h4>$params</h4>
+<code>array</code>
+</div>
+</div></div>
+</div>
+<a name="edit_db" id="edit_db"></a><div class="element clickable method public edit_db" data-toggle="collapse" data-target=".edit_db .collapse">
+<h2>Edit a database connection</h2>
+<pre>edit_db(string $name, array $params) </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$name</h4>
+<code>string</code>
+</div>
+<div class="subelement argument">
+<h4>$params</h4>
+<code>array</code>
+</div>
+</div></div>
+</div>
+<a name="get_db" id="get_db"></a><div class="element clickable method public get_db" data-toggle="collapse" data-target=".get_db .collapse">
+<h2>Retreive a specific database connection</h2>
+<pre>get_db(string $name) : object</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$name</h4>
+<code>string</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>object</code></div>
+</div></div>
+</div>
+<a name="get_dbs" id="get_dbs"></a><div class="element clickable method public get_dbs" data-toggle="collapse" data-target=".get_dbs .collapse">
+<h2>Retreive all db connections</h2>
+<pre>get_dbs() : array</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Returns</h3>
+<div class="subelement response"><code>array</code></div>
+</div></div>
+</div>
+<a name="get_instance" id="get_instance"></a><div class="element clickable method public get_instance" data-toggle="collapse" data-target=".get_instance .collapse">
+<h2>Static method to retreive current instance
+of the singleton</h2>
+<pre>get_instance() : <a href="../classes/OpensSQLManager.Settings.html">\OpensSQLManager\Settings</a></pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Returns</h3>
+<div class="subelement response"><code><a href="../classes/OpensSQLManager.Settings.html">\OpensSQLManager\Settings</a></code></div>
+</div></div>
+</div>
+<a name="remove_db" id="remove_db"></a><div class="element clickable method public remove_db" data-toggle="collapse" data-target=".remove_db .collapse">
+<h2>Remove a database connection</h2>
+<pre>remove_db(string $name) </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$name</h4>
+<code>string</code>
+</div>
+</div></div>
+</div>
+<a name="__construct" id="__construct"></a><div class="element clickable method private __construct" data-toggle="collapse" data-target=".__construct .collapse">
+<h2>Load the settings file - private so it can't be loaded
+directly - the settings should be safe!</h2>
+<pre>__construct() </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
+</div>
+<h3>
+<i class="icon-custom icon-property"></i> Properties</h3>
+<a name="%24current" id="$current"> </a><div class="element clickable property private $current" data-toggle="collapse" data-target=".$current .collapse">
+<h2>Settings object represented by the currently loaded JSON file</h2>
+<pre>$current </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
+</div>
+<a name="%24instance" id="$instance"> </a><div class="element clickable property private $instance" data-toggle="collapse" data-target=".$instance .collapse">
+<h2>Singleton instance</h2>
+<pre>$instance </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="row"><footer class="span12">
+            Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
+            Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
+            generated on 2012-05-31T09:50:12-04:00.<br></footer></div>
+</div>
+</body>
+</html>
diff --git a/docs/deprecated.html b/docs/deprecated.html
index 7ab2cb3..e3c671a 100644
--- a/docs/deprecated.html
+++ b/docs/deprecated.html
@@ -22,6 +22,7 @@
 <li><a>Packages</a></li>
 <li><a href="packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
 <li><a href="packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
 </ul>
 </li>
 <li class="dropdown" id="charts-menu">
@@ -66,7 +67,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-30T16:45:45-04:00.<br></footer></div>
+            generated on 2012-05-31T09:56:04-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/errors.html b/docs/errors.html
index 0d7dc35..1495617 100644
--- a/docs/errors.html
+++ b/docs/errors.html
@@ -22,6 +22,7 @@
 <li><a>Packages</a></li>
 <li><a href="packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
 <li><a href="packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
 </ul>
 </li>
 <li class="dropdown" id="charts-menu">
@@ -71,12 +72,14 @@
 <div class="package-contents"></div>
 <div class="package-contents"></div>
 <div class="package-contents"></div>
+<div class="package-contents"></div>
+<div class="package-contents"></div>
 </div>
 </div>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-30T16:45:45-04:00.<br></footer></div>
+            generated on 2012-05-31T09:56:04-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/graph_class.html b/docs/graph_class.html
index 3c77c0c..cf3365f 100644
--- a/docs/graph_class.html
+++ b/docs/graph_class.html
@@ -22,6 +22,7 @@
 <li><a>Packages</a></li>
 <li><a href="packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
 <li><a href="packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
 </ul>
 </li>
 <li class="dropdown" id="charts-menu">
@@ -63,7 +64,7 @@
         </script><div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-30T16:45:45-04:00.<br></footer></div>
+            generated on 2012-05-31T09:56:04-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/index.html b/docs/index.html
index da37b97..37654e2 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -22,6 +22,7 @@
 <li><a>Packages</a></li>
 <li><a href="packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
 <li><a href="packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
 </ul>
 </li>
 <li class="dropdown" id="charts-menu">
@@ -62,6 +63,7 @@
 <li class="nav-header">Packages</li>
 <li><a href="packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
 <li><a href="packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
 </ul></div>
 </div>
 <div class="span5">
@@ -84,7 +86,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-30T16:45:45-04:00.<br></footer></div>
+            generated on 2012-05-31T09:56:04-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/markers.html b/docs/markers.html
index 0851990..8298df8 100644
--- a/docs/markers.html
+++ b/docs/markers.html
@@ -22,6 +22,7 @@
 <li><a>Packages</a></li>
 <li><a href="packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
 <li><a href="packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
 </ul>
 </li>
 <li class="dropdown" id="charts-menu">
@@ -68,7 +69,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-30T16:45:45-04:00.<br></footer></div>
+            generated on 2012-05-31T09:56:04-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/namespaces/OpenSQLManager.html b/docs/namespaces/OpenSQLManager.html
index cd22ce5..ac7dceb 100644
--- a/docs/namespaces/OpenSQLManager.html
+++ b/docs/namespaces/OpenSQLManager.html
@@ -22,6 +22,7 @@
 <li><a>Packages</a></li>
 <li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
 <li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
 </ul>
 </li>
 <li class="dropdown" id="charts-menu">
@@ -206,6 +207,13 @@ with array_map and glob</h2>
 <div class="details collapse"></div>
 <a href="../classes/OpenSQLManager.Connection_Sidebar.html" class="more">« More »</a>
 </div>
+<a name="DB_Reg" id="DB_Reg"></a><div class="element ajax clickable class" href="../classes/OpenSQLManager.DB_Reg.html">
+<h1>DB_Reg<a href="../classes/OpenSQLManager.DB_Reg.html">¶</a>
+</h1>
+<p class="short_description">Connection registry</p>
+<div class="details collapse"></div>
+<a href="../classes/OpenSQLManager.DB_Reg.html" class="more">« More »</a>
+</div>
 <a name="DB_tabs" id="DB_tabs"></a><div class="element ajax clickable class" href="../classes/OpenSQLManager.DB_tabs.html">
 <h1>DB_tabs<a href="../classes/OpenSQLManager.DB_tabs.html">¶</a>
 </h1>
@@ -234,6 +242,13 @@ with array_map and glob</h2>
 <div class="details collapse"></div>
 <a href="../classes/OpenSQLManager.OpenSQLManager.html" class="more">« More »</a>
 </div>
+<a name="Settings" id="Settings"></a><div class="element ajax clickable class" href="../classes/OpenSQLManager.Settings.html">
+<h1>Settings<a href="../classes/OpenSQLManager.Settings.html">¶</a>
+</h1>
+<p class="short_description">Class for manipulating datbase connections, and miscellaneous settings</p>
+<div class="details collapse"></div>
+<a href="../classes/OpenSQLManager.Settings.html" class="more">« More »</a>
+</div>
 <h3>
 <i class="icon-custom icon-constant"></i> Constants</h3>
 <a name="BASE_DIR" id="BASE_DIR"> </a><div class="element clickable constant  BASE_DIR" data-toggle="collapse" data-target=".BASE_DIR .collapse">
@@ -266,7 +281,7 @@ with array_map and glob</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-30T16:45:45-04:00.<br></footer></div>
+            generated on 2012-05-31T09:56:04-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/namespaces/OpensSQLManager.html b/docs/namespaces/OpensSQLManager.html
new file mode 100644
index 0000000..9cd022a
--- /dev/null
+++ b/docs/namespaces/OpensSQLManager.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html><html xmlns:date="http://exslt.org/dates-and-times" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
+<meta charset="utf-8">
+<title>OpenSQLManager » OpensSQLManager</title>
+<meta name="author" content="Mike van Riel">
+<meta name="description" content="">
+<link href="../css/template.css" rel="stylesheet" media="all">
+<script src="../js/jquery-1.7.1.min.js" type="text/javascript"></script><script src="../js/jquery-ui-1.8.2.custom.min.js" type="text/javascript"></script><script src="../js/jquery.mousewheel.min.js" type="text/javascript"></script><script src="../js/bootstrap.js" type="text/javascript"></script><script src="../js/template.js" type="text/javascript"></script><script src="../js/prettify/prettify.min.js" type="text/javascript"></script><link rel="shortcut icon" href="../img/favicon.ico">
+<link rel="apple-touch-icon" href="../img/apple-touch-icon.png">
+<link rel="apple-touch-icon" sizes="72x72" href="../img/apple-touch-icon-72x72.png">
+<link rel="apple-touch-icon" sizes="114x114" href="../img/apple-touch-icon-114x114.png">
+</head>
+<body>
+<div class="navbar navbar-fixed-top">
+<div class="navbar-inner"><div class="container">
+<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
+<li class="dropdown">
+<a href="#api" class="dropdown-toggle" data-toggle="dropdown">
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
+</li>
+<li class="dropdown" id="charts-menu">
+<a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
+                                    Charts <b class="caret"></b></a><ul class="dropdown-menu"><li><a href="../graph_class.html"><i class="icon-list-alt"></i> Class hierarchy diagram</a></li></ul>
+</li>
+<li class="dropdown" id="reports-menu">
+<a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
+                                    Reports <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
+                <span class="label label-info">0</span></a></li>
+<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
+                <ul></ul></a></li>
+<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
+                <span class="label label-info">0</span></a></li>
+</ul>
+</li>
+</ul></div>
+</div></div>
+<div class="go_to_top"><a href="#___" style="color: inherit">Back to top  <i class="icon-upload icon-white"></i></a></div>
+</div>
+<div id="___" class="container">
+<noscript><div class="alert alert-warning">
+                            Javascript is disabled; several features are only available
+                            if Javascript is enabled.
+                        </div></noscript>
+<div class="row">
+<div class="span4">
+<div class="btn-group view pull-right" data-toggle="buttons-radio">
+<button class="btn details" title="Show descriptions and method names"><i class="icon-list"></i></button><button class="btn simple" title="Show only method names"><i class="icon-align-justify"></i></button>
+</div>
+<ul class="side-nav nav nav-list">
+<li class="nav-header">
+<i class="icon-map-marker"></i> Namespaces</li>
+<li>
+<a href="../namespaces/OpensSQLManager.html" title="OpensSQLManager"><i class="icon-th"></i>OpensSQLManager</a><ul class="nav nav-list nav-namespaces"></ul>
+</li>
+</ul>
+</div>
+<div class="span8 namespace-contents">
+<ul class="breadcrumb">
+<li>
+<a href="../index.html"><i class="icon-th"></i></a><span class="divider">\</span>
+</li>
+<li class="active"><a href="../namespaces/OpensSQLManager.html">OpensSQLManager</a></li>
+</ul>
+<div class="namespace-indent">
+<h3>
+<i class="icon-custom icon-class"></i> Classes and interfaces</h3>
+<a name="Settings" id="Settings"></a><div class="element ajax clickable class" href="../classes/OpensSQLManager.Settings.html">
+<h1>Settings<a href="../classes/OpensSQLManager.Settings.html">¶</a>
+</h1>
+<p class="short_description">Class for manipulating datbase connections, and miscellaneous settings</p>
+<div class="details collapse"></div>
+<a href="../classes/OpensSQLManager.Settings.html" class="more">« More »</a>
+</div>
+</div>
+</div>
+</div>
+<div class="row"><footer class="span12">
+            Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
+            Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
+            generated on 2012-05-31T09:50:12-04:00.<br></footer></div>
+</div>
+</body>
+</html>
diff --git a/docs/packages/.html b/docs/packages/.html
index 0901a31..9cfd145 100644
--- a/docs/packages/.html
+++ b/docs/packages/.html
@@ -22,6 +22,7 @@
 <li><a>Packages</a></li>
 <li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
 <li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
 </ul>
 </li>
 <li class="dropdown" id="charts-menu">
@@ -66,7 +67,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-30T16:45:45-04:00.<br></footer></div>
+            generated on 2012-05-31T09:56:04-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/packages/Default.html b/docs/packages/Default.html
index 3d2c97b..5cfabd8 100644
--- a/docs/packages/Default.html
+++ b/docs/packages/Default.html
@@ -22,6 +22,7 @@
 <li><a>Packages</a></li>
 <li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
 <li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
 </ul>
 </li>
 <li class="dropdown" id="charts-menu">
@@ -107,7 +108,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-30T16:45:45-04:00.<br></footer></div>
+            generated on 2012-05-31T09:56:04-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/packages/OpenSQLManager.Widgets.html b/docs/packages/OpenSQLManager.Widgets.html
index 394fade..25d032e 100644
--- a/docs/packages/OpenSQLManager.Widgets.html
+++ b/docs/packages/OpenSQLManager.Widgets.html
@@ -22,6 +22,7 @@
 <li><a>Packages</a></li>
 <li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
 <li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
 </ul>
 </li>
 <li class="dropdown" id="charts-menu">
@@ -62,9 +63,9 @@
 <li class="nav-header">
 <i class="icon-custom icon-class"></i> Classes</li>
 <li><a href="#Connection_Sidebar" title="Widget managing saved database connections">Connection_Sidebar</a></li>
-<li><a href="#Connection_Manager" title="Widget for adding / Editing Connections">Connection_Manager</a></li>
 <li><a href="#Data_Grid" title="Class to simplify dealing with GtkTreeView">Data_Grid</a></li>
 <li><a href="#DB_tabs" title="Tabbed Container for database properties">DB_tabs</a></li>
+<li><a href="#Connection_Manager" title="Widget for adding / Editing Connections">Connection_Manager</a></li>
 </ul>
 </div>
 <div class="span8 package-contents">
@@ -112,7 +113,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-30T16:45:45-04:00.<br></footer></div>
+            generated on 2012-05-31T09:56:04-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/packages/OpenSQLManager.Windows.html b/docs/packages/OpenSQLManager.Windows.html
index d8d739f..bc78937 100644
--- a/docs/packages/OpenSQLManager.Windows.html
+++ b/docs/packages/OpenSQLManager.Windows.html
@@ -22,6 +22,7 @@
 <li><a>Packages</a></li>
 <li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
 <li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
 </ul>
 </li>
 <li class="dropdown" id="charts-menu">
@@ -88,7 +89,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-30T16:45:45-04:00.<br></footer></div>
+            generated on 2012-05-31T09:56:04-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/packages/OpenSQLManager.html b/docs/packages/OpenSQLManager.html
index fac1a11..6a4d3c6 100644
--- a/docs/packages/OpenSQLManager.html
+++ b/docs/packages/OpenSQLManager.html
@@ -22,6 +22,7 @@
 <li><a>Packages</a></li>
 <li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
 <li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
 </ul>
 </li>
 <li class="dropdown" id="charts-menu">
@@ -284,7 +285,7 @@ with array_map and glob</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-05-30T16:45:45-04:00.<br></footer></div>
+            generated on 2012-05-31T09:56:04-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/packages/Query.Helper Classes.html b/docs/packages/Query.Helper Classes.html
new file mode 100644
index 0000000..d0bee85
--- /dev/null
+++ b/docs/packages/Query.Helper Classes.html	
@@ -0,0 +1,103 @@
+<!DOCTYPE html><html xmlns:date="http://exslt.org/dates-and-times" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
+<meta charset="utf-8">
+<title>OpenSQLManager » Query\Helper Classes</title>
+<meta name="author" content="Mike van Riel">
+<meta name="description" content="">
+<link href="../css/template.css" rel="stylesheet" media="all">
+<script src="../js/jquery-1.7.1.min.js" type="text/javascript"></script><script src="../js/jquery-ui-1.8.2.custom.min.js" type="text/javascript"></script><script src="../js/jquery.mousewheel.min.js" type="text/javascript"></script><script src="../js/bootstrap.js" type="text/javascript"></script><script src="../js/template.js" type="text/javascript"></script><script src="../js/prettify/prettify.min.js" type="text/javascript"></script><link rel="shortcut icon" href="../img/favicon.ico">
+<link rel="apple-touch-icon" href="../img/apple-touch-icon.png">
+<link rel="apple-touch-icon" sizes="72x72" href="../img/apple-touch-icon-72x72.png">
+<link rel="apple-touch-icon" sizes="114x114" href="../img/apple-touch-icon-114x114.png">
+</head>
+<body>
+<div class="navbar navbar-fixed-top">
+<div class="navbar-inner"><div class="container">
+<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
+<li class="dropdown">
+<a href="#api" class="dropdown-toggle" data-toggle="dropdown">
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
+</li>
+<li class="dropdown" id="charts-menu">
+<a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
+                                    Charts <b class="caret"></b></a><ul class="dropdown-menu"><li><a href="../graph_class.html"><i class="icon-list-alt"></i> Class hierarchy diagram</a></li></ul>
+</li>
+<li class="dropdown" id="reports-menu">
+<a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
+                                    Reports <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
+                <span class="label label-info">0</span></a></li>
+<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
+                <ul></ul></a></li>
+<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
+                <span class="label label-info">0</span></a></li>
+</ul>
+</li>
+</ul></div>
+</div></div>
+<div class="go_to_top"><a href="#___" style="color: inherit">Back to top  <i class="icon-upload icon-white"></i></a></div>
+</div>
+<div id="___" class="container">
+<noscript><div class="alert alert-warning">
+                            Javascript is disabled; several features are only available
+                            if Javascript is enabled.
+                        </div></noscript>
+<div class="row">
+<div class="span4">
+<div class="btn-group view pull-right" data-toggle="buttons-radio">
+<button class="btn details" title="Show descriptions and method names"><i class="icon-list"></i></button><button class="btn simple" title="Show only method names"><i class="icon-align-justify"></i></button>
+</div>
+<ul class="side-nav nav nav-list">
+<li class="nav-header">
+<i class="icon-map-marker"></i> Packages</li>
+<li>
+<a href="../packages/Query.Helper%20Classes.html" title="Helper Classes"><i class="icon-folder-open"></i>Helper Classes</a><ul class="nav nav-list nav-packages"></ul>
+</li>
+<li class="nav-header">
+<i class="icon-custom icon-class"></i> Classes</li>
+<li><a href="#DB_Reg" title="Connection registry">DB_Reg</a></li>
+<li><a href="#Settings" title="Class for manipulating datbase connections, and miscellaneous settings">Settings</a></li>
+</ul>
+</div>
+<div class="span8 package-contents">
+<ul class="breadcrumb">
+<li>
+<a href="../index.html"><i class="icon-folder-open"></i></a><span class="divider">\</span>
+</li>
+<li><a href="../packages/Query.html">Query</a></li>
+<span class="divider">\</span><li class="active"><a href="../packages/Query.Helper%20Classes.html">Helper Classes</a></li>
+</ul>
+<div class="package-indent">
+<h3>
+<i class="icon-custom icon-class"></i> Classes and interfaces</h3>
+<a name="DB_Reg" id="DB_Reg"></a><div class="element ajax clickable class" href="../classes/OpenSQLManager.DB_Reg.html">
+<h1>DB_Reg<a href="../classes/OpenSQLManager.DB_Reg.html">¶</a>
+</h1>
+<p class="short_description">Connection registry</p>
+<div class="details collapse"></div>
+<a href="../classes/OpenSQLManager.DB_Reg.html" class="more">« More »</a>
+</div>
+<a name="Settings" id="Settings"></a><div class="element ajax clickable class" href="../classes/OpenSQLManager.Settings.html">
+<h1>Settings<a href="../classes/OpenSQLManager.Settings.html">¶</a>
+</h1>
+<p class="short_description">Class for manipulating datbase connections, and miscellaneous settings</p>
+<div class="details collapse"></div>
+<a href="../classes/OpenSQLManager.Settings.html" class="more">« More »</a>
+</div>
+</div>
+</div>
+</div>
+<div class="row"><footer class="span12">
+            Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
+            Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
+            generated on 2012-05-31T09:56:04-04:00.<br></footer></div>
+</div>
+</body>
+</html>
diff --git a/docs/packages/Query.html b/docs/packages/Query.html
new file mode 100644
index 0000000..196b3da
--- /dev/null
+++ b/docs/packages/Query.html
@@ -0,0 +1,109 @@
+<!DOCTYPE html><html xmlns:date="http://exslt.org/dates-and-times" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
+<meta charset="utf-8">
+<title>OpenSQLManager » Query</title>
+<meta name="author" content="Mike van Riel">
+<meta name="description" content="">
+<link href="../css/template.css" rel="stylesheet" media="all">
+<script src="../js/jquery-1.7.1.min.js" type="text/javascript"></script><script src="../js/jquery-ui-1.8.2.custom.min.js" type="text/javascript"></script><script src="../js/jquery.mousewheel.min.js" type="text/javascript"></script><script src="../js/bootstrap.js" type="text/javascript"></script><script src="../js/template.js" type="text/javascript"></script><script src="../js/prettify/prettify.min.js" type="text/javascript"></script><link rel="shortcut icon" href="../img/favicon.ico">
+<link rel="apple-touch-icon" href="../img/apple-touch-icon.png">
+<link rel="apple-touch-icon" sizes="72x72" href="../img/apple-touch-icon-72x72.png">
+<link rel="apple-touch-icon" sizes="114x114" href="../img/apple-touch-icon-114x114.png">
+</head>
+<body>
+<div class="navbar navbar-fixed-top">
+<div class="navbar-inner"><div class="container">
+<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
+<li class="dropdown">
+<a href="#api" class="dropdown-toggle" data-toggle="dropdown">
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
+</li>
+<li class="dropdown" id="charts-menu">
+<a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
+                                    Charts <b class="caret"></b></a><ul class="dropdown-menu"><li><a href="../graph_class.html"><i class="icon-list-alt"></i> Class hierarchy diagram</a></li></ul>
+</li>
+<li class="dropdown" id="reports-menu">
+<a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
+                                    Reports <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
+                <span class="label label-info">0</span></a></li>
+<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
+                <ul></ul></a></li>
+<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
+                <span class="label label-info">0</span></a></li>
+</ul>
+</li>
+</ul></div>
+</div></div>
+<div class="go_to_top"><a href="#___" style="color: inherit">Back to top  <i class="icon-upload icon-white"></i></a></div>
+</div>
+<div id="___" class="container">
+<noscript><div class="alert alert-warning">
+                            Javascript is disabled; several features are only available
+                            if Javascript is enabled.
+                        </div></noscript>
+<div class="row">
+<div class="span4">
+<div class="btn-group view pull-right" data-toggle="buttons-radio">
+<button class="btn details" title="Show descriptions and method names"><i class="icon-list"></i></button><button class="btn simple" title="Show only method names"><i class="icon-align-justify"></i></button>
+</div>
+<ul class="side-nav nav nav-list">
+<li class="nav-header">
+<i class="icon-map-marker"></i> Packages</li>
+<li>
+<span class="empty-package"><i class="icon-folder-close"></i>Query</span><ul class="nav nav-list nav-packages"><li>
+<a href="../packages/Query.Helper%20Classes.html" title="Helper Classes"><i class="icon-folder-open"></i>Helper Classes</a><ul class="nav nav-list nav-packages"></ul>
+</li></ul>
+</li>
+</ul>
+</div>
+<div class="span8 package-contents">
+<ul class="breadcrumb">
+<li>
+<a href="../index.html"><i class="icon-folder-open"></i></a><span class="divider">\</span>
+</li>
+<li class="active"><a href="../packages/Query.html">Query</a></li>
+</ul>
+<div class="package-indent">
+<ul class="breadcrumb">
+<li>
+<a href="../index.html"><i class="icon-folder-open"></i></a><span class="divider">\</span>
+</li>
+<li><a href="../packages/Query.html">Query</a></li>
+<span class="divider">\</span><li class="active"><a href="../packages/Query.Helper%20Classes.html">Helper Classes</a></li>
+</ul>
+<div class="package-indent">
+<h3>
+<i class="icon-custom icon-class"></i> Classes and interfaces</h3>
+<a name="DB_Reg" id="DB_Reg"></a><div class="element ajax clickable class" href="../classes/OpenSQLManager.DB_Reg.html">
+<h1>DB_Reg<a href="../classes/OpenSQLManager.DB_Reg.html">¶</a>
+</h1>
+<p class="short_description">Connection registry</p>
+<div class="details collapse"></div>
+<a href="../classes/OpenSQLManager.DB_Reg.html" class="more">« More »</a>
+</div>
+<a name="Settings" id="Settings"></a><div class="element ajax clickable class" href="../classes/OpenSQLManager.Settings.html">
+<h1>Settings<a href="../classes/OpenSQLManager.Settings.html">¶</a>
+</h1>
+<p class="short_description">Class for manipulating datbase connections, and miscellaneous settings</p>
+<div class="details collapse"></div>
+<a href="../classes/OpenSQLManager.Settings.html" class="more">« More »</a>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="row"><footer class="span12">
+            Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
+            Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
+            generated on 2012-05-31T09:56:04-04:00.<br></footer></div>
+</div>
+</body>
+</html>
diff --git a/docs/structure.xml b/docs/structure.xml
index b0ae4d3..279cc62 100644
--- a/docs/structure.xml
+++ b/docs/structure.xml
@@ -152,6 +152,304 @@ with array_map and glob]]></description>
       </method>
     </class>
   </file>
+  <file path="sys/common/db_reg.php" hash="3598ba0fed487d36dfd11ba0c8d7c839" package="OpenSQLManager">
+    <docblock line="2">
+      <description><![CDATA[OpenSQLManager]]></description>
+      <long-description><![CDATA[<p>Free Database manager for Open Source Databases</p>]]></long-description>
+      <tag line="2" name="package" description="OpenSQLManager"/>
+      <tag line="2" name="author" description="Timothy J. Warren"/>
+      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
+      <tag line="2" name="link" description="https://github.com/aviat4ion/OpenSQLManager" link="https://github.com/aviat4ion/OpenSQLManager"/>
+      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
+    </docblock>
+    <class final="false" abstract="false" namespace="OpenSQLManager" line="27" package="Query\Helper Classes">
+      <name>DB_Reg</name>
+      <full_name>\OpenSQLManager\DB_Reg</full_name>
+      <extends/>
+      <docblock line="18">
+        <description><![CDATA[Connection registry]]></description>
+        <long-description><![CDATA[<p>Decouples the Settings class from the query builder
+and organizes database connections</p>]]></long-description>
+        <tag line="18" name="package" description="Query"/>
+        <tag line="18" name="subpackage" description="Helper Classes"/>
+      </docblock>
+      <property final="false" static="true" visibility="private" line="32" package="Default">
+        <name>$instance</name>
+        <default><![CDATA[array()]]></default>
+        <docblock line="29">
+          <description><![CDATA[Static array of connections]]></description>
+          <long-description><![CDATA[]]></long-description>
+        </docblock>
+      </property>
+      <method final="false" abstract="false" static="true" visibility="public" namespace="OpenSQLManager" line="40" package="">
+        <name>get_db</name>
+        <type>function</type>
+        <docblock line="34">
+          <description><![CDATA[Registry access method]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="34" name="param" description="" type="string" variable="$key">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="34" name="return" description="" type="object">
+            <type by_reference="false">object</type>
+          </tag>
+        </docblock>
+        <argument line="40">
+          <name>$key</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="private" namespace="OpenSQLManager" line="58" package="">
+        <name>__construct</name>
+        <type>function</type>
+        <docblock line="53">
+          <description><![CDATA[Private constructor]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="53" name="param" description="" type="string" variable="$key">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="58">
+          <name>$key</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="true" visibility="public" namespace="OpenSQLManager" line="74" package="">
+        <name>get_connections</name>
+        <type>function</type>
+        <docblock line="69">
+          <description><![CDATA[Return exiting connections]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="69" name="return" description="" type="array">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="true" visibility="public" namespace="OpenSQLManager" line="87" package="">
+        <name>remove_db</name>
+        <type>function</type>
+        <docblock line="81">
+          <description><![CDATA[Remove a database connection]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="81" name="param" description="" type="string" variable="$key">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="81" name="return" description="" type="void">
+            <type by_reference="false">void</type>
+          </tag>
+        </docblock>
+        <argument line="87">
+          <name>$key</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+    </class>
+  </file>
+  <file path="sys/common/settings.php" hash="7859abd7375d83a20a253c5d0cbf9498" package="OpenSQLManager">
+    <docblock line="2">
+      <description><![CDATA[OpenSQLManager]]></description>
+      <long-description><![CDATA[<p>Free Database manager for Open Source Databases</p>]]></long-description>
+      <tag line="2" name="package" description="OpenSQLManager"/>
+      <tag line="2" name="author" description="Timothy J. Warren"/>
+      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
+      <tag line="2" name="link" description="https://github.com/aviat4ion/OpenSQLManager" link="https://github.com/aviat4ion/OpenSQLManager"/>
+      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
+    </docblock>
+    <class final="false" abstract="false" namespace="OpenSQLManager" line="24" package="Query\Helper Classes">
+      <name>Settings</name>
+      <full_name>\OpenSQLManager\Settings</full_name>
+      <extends/>
+      <docblock line="18">
+        <description><![CDATA[Class for manipulating datbase connections, and miscellaneous settings]]></description>
+        <long-description><![CDATA[]]></long-description>
+        <tag line="18" name="package" description="Query"/>
+        <tag line="18" name="subpackage" description="Helper Classes"/>
+      </docblock>
+      <property final="false" static="false" visibility="private" line="29" package="Default">
+        <name>$current</name>
+        <default><![CDATA[]]></default>
+        <docblock line="26">
+          <description><![CDATA[Settings object represented by the currently loaded JSON file]]></description>
+          <long-description><![CDATA[]]></long-description>
+        </docblock>
+      </property>
+      <property final="false" static="true" visibility="private" line="34" package="Default">
+        <name>$instance</name>
+        <default><![CDATA[]]></default>
+        <docblock line="31">
+          <description><![CDATA[Singleton instance]]></description>
+          <long-description><![CDATA[]]></long-description>
+        </docblock>
+      </property>
+      <method final="false" abstract="false" static="true" visibility="public" namespace="OpenSQLManager" line="42" package="">
+        <name>get_instance</name>
+        <type>function</type>
+        <docblock line="36">
+          <description><![CDATA[Static method to retreive current instance
+of the singleton]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="36" name="return" description="" type="\OpenSQLManager\Settings">
+            <type by_reference="false">\OpenSQLManager\Settings</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="private" namespace="OpenSQLManager" line="57" package="">
+        <name>__construct</name>
+        <type>function</type>
+        <docblock line="53">
+          <description><![CDATA[Load the settings file - private so it can't be loaded
+directly - the settings should be safe!]]></description>
+          <long-description><![CDATA[]]></long-description>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="OpenSQLManager" line="92" package="">
+        <name>__destruct</name>
+        <type>function</type>
+        <docblock line="89">
+          <description><![CDATA[Output the settings on destruct]]></description>
+          <long-description><![CDATA[]]></long-description>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="OpenSQLManager" line="109" package="">
+        <name>__get</name>
+        <type>function</type>
+        <docblock line="103">
+          <description><![CDATA[Magic method to simplify isset checking for config options]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="103" name="param" description="" type="string" variable="$key">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="103" name="return" description="" type="mixed">
+            <type by_reference="false">mixed</type>
+          </tag>
+        </docblock>
+        <argument line="109">
+          <name>$key</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="OpenSQLManager" line="124" package="">
+        <name>__set</name>
+        <type>function</type>
+        <docblock line="118">
+          <description><![CDATA[Magic method to simplify setting config options]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="118" name="param" description="" type="string" variable="$key">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="118" name="param" description="mixed" type="" variable="$val"/>
+        </docblock>
+        <argument line="124">
+          <name>$key</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="124">
+          <name>$val</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="OpenSQLManager" line="143" package="">
+        <name>add_db</name>
+        <type>function</type>
+        <docblock line="137">
+          <description><![CDATA[Add a database connection]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="137" name="param" description="" type="string" variable="$name">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="137" name="param" description="" type="array" variable="$params">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+        <argument line="143">
+          <name>$name</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="143">
+          <name>$params</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="OpenSQLManager" line="175" package="">
+        <name>edit_db</name>
+        <type>function</type>
+        <docblock line="169">
+          <description><![CDATA[Edit a database connection]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="169" name="param" description="" type="string" variable="$name">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="169" name="param" description="" type="array" variable="$params">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+        <argument line="175">
+          <name>$name</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="175">
+          <name>$params</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="OpenSQLManager" line="218" package="">
+        <name>remove_db</name>
+        <type>function</type>
+        <docblock line="213">
+          <description><![CDATA[Remove a database connection]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="213" name="param" description="" type="string" variable="$name">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="218">
+          <name>$name</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="OpenSQLManager" line="239" package="">
+        <name>get_dbs</name>
+        <type>function</type>
+        <docblock line="234">
+          <description><![CDATA[Retreive all db connections]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="234" name="return" description="" type="array">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="OpenSQLManager" line="252" package="">
+        <name>get_db</name>
+        <type>function</type>
+        <docblock line="246">
+          <description><![CDATA[Retreive a specific database connection]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="246" name="param" description="" type="string" variable="$name">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="246" name="return" description="" type="object">
+            <type by_reference="false">object</type>
+          </tag>
+        </docblock>
+        <argument line="252">
+          <name>$name</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+    </class>
+  </file>
   <file path="sys/common/functions.php" hash="68d4a7cd2278329346ce123e87bc12dc" package="OpenSQLManager">
     <docblock line="2">
       <description><![CDATA[OpenSQLManager]]></description>
@@ -239,7 +537,7 @@ with array_map and glob]]></description>
       </argument>
     </function>
   </file>
-  <file path="sys/widgets/connection_sidebar.php" hash="97f6e8b8d8fd95888d04b1148d8bc276" package="OpenSQLManager">
+  <file path="sys/widgets/connection_sidebar.php" hash="8b5543265b9ba9ddbfcc860485908511" package="OpenSQLManager">
     <docblock line="2">
       <description><![CDATA[OpenSQLManager]]></description>
       <long-description><![CDATA[<p>Free Database manager for Open Source Databases</p>]]></long-description>
@@ -418,113 +716,6 @@ with array_map and glob]]></description>
       </method>
     </class>
   </file>
-  <file path="sys/widgets/connection_manager.php" hash="e651cf96a7bff92016beae719b6a8272" package="OpenSQLManager">
-    <docblock line="2">
-      <description><![CDATA[OpenSQLManager]]></description>
-      <long-description><![CDATA[<p>Free Database manager for Open Source Databases</p>]]></long-description>
-      <tag line="2" name="package" description="OpenSQLManager"/>
-      <tag line="2" name="author" description="Timothy J. Warren"/>
-      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
-      <tag line="2" name="link" description="https://github.com/aviat4ion/OpenSQLManager" link="https://github.com/aviat4ion/OpenSQLManager"/>
-      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
-    </docblock>
-    <class final="false" abstract="false" namespace="OpenSQLManager" line="24" package="OpenSQLManager\Widgets">
-      <name>Connection_Manager</name>
-      <full_name>\OpenSQLManager\Connection_Manager</full_name>
-      <extends>\wxFrame</extends>
-      <docblock line="18">
-        <description><![CDATA[Widget for adding / Editing Connections]]></description>
-        <long-description><![CDATA[]]></long-description>
-        <tag line="18" name="package" description="OpenSQLManager"/>
-        <tag line="18" name="subpackage" description="Widgets"/>
-      </docblock>
-      <constant namespace="OpenSQLManager" line="26" package="Default">
-        <name>TXT_CONN_NAME</name>
-        <value><![CDATA[1]]></value>
-      </constant>
-      <constant namespace="OpenSQLManager" line="27" package="Default">
-        <name>COMBO_DB_TYPE</name>
-        <value><![CDATA[2]]></value>
-      </constant>
-      <constant namespace="OpenSQLManager" line="28" package="Default">
-        <name>FILE_DB_FILE</name>
-        <value><![CDATA[3]]></value>
-      </constant>
-      <constant namespace="OpenSQLManager" line="29" package="Default">
-        <name>TXT_DB_NAME</name>
-        <value><![CDATA[4]]></value>
-      </constant>
-      <constant namespace="OpenSQLManager" line="30" package="Default">
-        <name>TXT_DB_HOST</name>
-        <value><![CDATA[5]]></value>
-      </constant>
-      <constant namespace="OpenSQLManager" line="31" package="Default">
-        <name>TXT_DB_PORT</name>
-        <value><![CDATA[6]]></value>
-      </constant>
-      <constant namespace="OpenSQLManager" line="32" package="Default">
-        <name>TXT_DB_USER</name>
-        <value><![CDATA[7]]></value>
-      </constant>
-      <constant namespace="OpenSQLManager" line="33" package="Default">
-        <name>TXT_DB_PASS</name>
-        <value><![CDATA[8]]></value>
-      </constant>
-      <property final="false" static="false" visibility="protected" line="40" package="Default">
-        <name>$fields</name>
-        <default><![CDATA[array()]]></default>
-        <docblock line="35">
-          <description><![CDATA[Array of fields for Connection Information manipulation]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="35" name="var" description="" type="array">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-      </property>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="OpenSQLManager" line="48" package="">
-        <name>__construct</name>
-        <type>function</type>
-        <docblock line="42">
-          <description><![CDATA[Create the window]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="42" name="param" description="wxWindow" type="" variable="$parent"/>
-          <tag line="42" name="param" description="mixed" type="" variable="$params"/>
-        </docblock>
-        <argument line="48">
-          <name>$parent</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="48">
-          <name>$params</name>
-          <default><![CDATA[array()]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="protected" namespace="OpenSQLManager" line="63" package="">
-        <name>_layout</name>
-        <type>function</type>
-        <docblock line="58">
-          <description><![CDATA[Layout fields on the form]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="58" name="param" description="array" type="" variable="$params"/>
-        </docblock>
-        <argument line="63">
-          <name>$params</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="protected" namespace="OpenSQLManager" line="119" package="">
-        <name>get_available_dbs</name>
-        <type>function</type>
-        <docblock line="114">
-          <description><![CDATA[Get the list of available database types]]></description>
-          <long-description><![CDATA[<p>return array</p>]]></long-description>
-        </docblock>
-      </method>
-    </class>
-  </file>
   <file path="sys/widgets/data_grid.php" hash="5794c991a5ee3ae141b636a7fcaa3a16" package="OpenSQLManager">
     <docblock line="2">
       <description><![CDATA[OpenSQLManager]]></description>
@@ -651,7 +842,114 @@ with array_map and glob]]></description>
       </method>
     </class>
   </file>
-  <file path="sys/windows/main.php" hash="c89e0c41b4d71a435cb6dd1a5c95c0b1" package="OpenSQLManager">
+  <file path="sys/windows/connection_manager.php" hash="e651cf96a7bff92016beae719b6a8272" package="OpenSQLManager">
+    <docblock line="2">
+      <description><![CDATA[OpenSQLManager]]></description>
+      <long-description><![CDATA[<p>Free Database manager for Open Source Databases</p>]]></long-description>
+      <tag line="2" name="package" description="OpenSQLManager"/>
+      <tag line="2" name="author" description="Timothy J. Warren"/>
+      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
+      <tag line="2" name="link" description="https://github.com/aviat4ion/OpenSQLManager" link="https://github.com/aviat4ion/OpenSQLManager"/>
+      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
+    </docblock>
+    <class final="false" abstract="false" namespace="OpenSQLManager" line="24" package="OpenSQLManager\Widgets">
+      <name>Connection_Manager</name>
+      <full_name>\OpenSQLManager\Connection_Manager</full_name>
+      <extends>\wxFrame</extends>
+      <docblock line="18">
+        <description><![CDATA[Widget for adding / Editing Connections]]></description>
+        <long-description><![CDATA[]]></long-description>
+        <tag line="18" name="package" description="OpenSQLManager"/>
+        <tag line="18" name="subpackage" description="Widgets"/>
+      </docblock>
+      <constant namespace="OpenSQLManager" line="26" package="Default">
+        <name>TXT_CONN_NAME</name>
+        <value><![CDATA[1]]></value>
+      </constant>
+      <constant namespace="OpenSQLManager" line="27" package="Default">
+        <name>COMBO_DB_TYPE</name>
+        <value><![CDATA[2]]></value>
+      </constant>
+      <constant namespace="OpenSQLManager" line="28" package="Default">
+        <name>FILE_DB_FILE</name>
+        <value><![CDATA[3]]></value>
+      </constant>
+      <constant namespace="OpenSQLManager" line="29" package="Default">
+        <name>TXT_DB_NAME</name>
+        <value><![CDATA[4]]></value>
+      </constant>
+      <constant namespace="OpenSQLManager" line="30" package="Default">
+        <name>TXT_DB_HOST</name>
+        <value><![CDATA[5]]></value>
+      </constant>
+      <constant namespace="OpenSQLManager" line="31" package="Default">
+        <name>TXT_DB_PORT</name>
+        <value><![CDATA[6]]></value>
+      </constant>
+      <constant namespace="OpenSQLManager" line="32" package="Default">
+        <name>TXT_DB_USER</name>
+        <value><![CDATA[7]]></value>
+      </constant>
+      <constant namespace="OpenSQLManager" line="33" package="Default">
+        <name>TXT_DB_PASS</name>
+        <value><![CDATA[8]]></value>
+      </constant>
+      <property final="false" static="false" visibility="protected" line="40" package="Default">
+        <name>$fields</name>
+        <default><![CDATA[array()]]></default>
+        <docblock line="35">
+          <description><![CDATA[Array of fields for Connection Information manipulation]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="35" name="var" description="" type="array">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+      </property>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="OpenSQLManager" line="48" package="">
+        <name>__construct</name>
+        <type>function</type>
+        <docblock line="42">
+          <description><![CDATA[Create the window]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="42" name="param" description="wxWindow" type="" variable="$parent"/>
+          <tag line="42" name="param" description="mixed" type="" variable="$params"/>
+        </docblock>
+        <argument line="48">
+          <name>$parent</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="48">
+          <name>$params</name>
+          <default><![CDATA[array()]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="protected" namespace="OpenSQLManager" line="63" package="">
+        <name>_layout</name>
+        <type>function</type>
+        <docblock line="58">
+          <description><![CDATA[Layout fields on the form]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="58" name="param" description="array" type="" variable="$params"/>
+        </docblock>
+        <argument line="63">
+          <name>$params</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="protected" namespace="OpenSQLManager" line="119" package="">
+        <name>get_available_dbs</name>
+        <type>function</type>
+        <docblock line="114">
+          <description><![CDATA[Get the list of available database types]]></description>
+          <long-description><![CDATA[<p>return array</p>]]></long-description>
+        </docblock>
+      </method>
+    </class>
+  </file>
+  <file path="sys/windows/main.php" hash="28ed5acc6ae1bd3153cd50f3cdd51459" package="OpenSQLManager">
     <docblock line="2">
       <description><![CDATA[OpenSQLManager]]></description>
       <long-description><![CDATA[<p>Free Database manager for Open Source Databases</p>]]></long-description>
@@ -776,6 +1074,9 @@ Create menus, hboxes, vboxs and other widgets]]></description>
     <package name="Widgets" full_name="OpenSQLManager\Widgets"/>
     <package name="Windows" full_name="OpenSQLManager\Windows"/>
   </package>
+  <package name="Query" full_name="Query">
+    <package name="Helper Classes" full_name="Query\Helper Classes"/>
+  </package>
   <namespace name="OpenSQLManager" full_name="OpenSQLManager"/>
   <marker count="0">todo</marker>
   <marker count="0">fixme</marker>
diff --git a/sys/common/db_reg.php b/sys/common/db_reg.php
new file mode 100644
index 0000000..852e349
--- /dev/null
+++ b/sys/common/db_reg.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * OpenSQLManager
+ *
+ * Free Database manager for Open Source Databases
+ *
+ * @package		OpenSQLManager
+ * @author 		Timothy J. Warren
+ * @copyright	Copyright (c) 2012
+ * @link 		https://github.com/aviat4ion/OpenSQLManager
+ * @license 	http://philsturgeon.co.uk/code/dbad-license
+ */
+
+// --------------------------------------------------------------------------
+
+namespace OpenSQLManager;
+
+/**
+ * Connection registry
+ *
+ * Decouples the Settings class from the query builder
+ * and organizes database connections
+ *
+ * @package Query
+ * @subpackage Helper Classes
+ */
+class DB_Reg {
+
+	/**
+	 * Static array of connections
+	 */
+	private static $instance=array();
+
+	/**
+	 * Registry access method
+	 *
+	 * @param string $key
+	 * @return object
+	 */
+	public static function &get_db($key)
+	{
+		if ( ! isset(self::$instance[$key]))
+		{
+			// The constructor sets the instance
+			new DB_Reg($key);
+		}
+
+		return self::$instance[$key];
+	}
+
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Private constructor
+	 *
+	 * @param string $key
+	 */
+	private function __construct($key)
+	{
+		// Get the db connection parameters for the current database
+		$db_params = Settings::get_instance()->get_db($key);
+
+		// Set the current key in the registry
+		self::$instance[$key] = new Query_Builder($db_params);
+	}
+
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Return exiting connections
+	 *
+	 * @return array
+	 */
+	public static function get_connections()
+	{
+		return array_keys(self::$instance);
+	}
+
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Remove a database connection
+	 *
+	 * @param string $key
+	 * @return void
+	 */
+	public static function remove_db($key)
+	{
+		unset(self::$instance[$key]);
+	}
+}
+// End of dbreg.php
\ No newline at end of file
diff --git a/sys/common/settings.php b/sys/common/settings.php
new file mode 100644
index 0000000..56ba2bb
--- /dev/null
+++ b/sys/common/settings.php
@@ -0,0 +1,260 @@
+<?php
+/**
+ * OpenSQLManager
+ *
+ * Free Database manager for Open Source Databases
+ *
+ * @package		OpenSQLManager
+ * @author 		Timothy J. Warren
+ * @copyright	Copyright (c) 2012
+ * @link 		https://github.com/aviat4ion/OpenSQLManager
+ * @license 	http://philsturgeon.co.uk/code/dbad-license
+ */
+
+// --------------------------------------------------------------------------
+
+namespace OpenSQLManager;
+
+/**
+ * Class for manipulating datbase connections, and miscellaneous settings
+ *
+ * @package Query
+ * @subpackage Helper Classes
+ */
+class Settings {
+
+	/**
+	 * Settings object represented by the currently loaded JSON file
+	 */
+	private $current;
+
+	/**
+	 * Singleton instance
+	 */
+	private static $instance;
+
+	/**
+	 * Static method to retreive current instance
+	 * of the singleton
+	 *
+	 * @return Settings
+	 */
+	public static function &get_instance()
+	{
+		if( ! isset(self::$instance))
+		{
+			$name = __CLASS__;
+			self::$instance = new $name();
+		}
+
+		return self::$instance;
+	}
+
+	/**
+	 * Load the settings file - private so it can't be loaded
+	 * directly - the settings should be safe!
+	 */
+	private function __construct()
+	{
+		// For testing and use outside of OpenSQLManager,
+		// define a different SETTINGS_DIR
+		if ( ! defined('SETTINGS_DIR'))
+		{
+			define('SETTINGS_DIR', '.');
+		}
+
+		$path = SETTINGS_DIR.'/settings.json';
+
+		if( ! is_file($path))
+		{
+			//Create the file!
+			touch($path);
+			$this->current = new stdClass();
+		}
+		else
+		{
+			$this->current = json_decode(file_get_contents($path));
+		}
+
+		// Add the DB object under the settings if it doesn't already exist
+		if( ! isset($this->current->dbs))
+		{
+			$this->current->dbs = new stdClass();
+		}
+
+	}
+
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Output the settings on destruct
+	 */
+	public function __destruct()
+	{
+		$file_string = (defined('JSON_PRETTY_PRINT'))
+			? json_encode($this->current, JSON_PRETTY_PRINT)
+			: json_encode($this->current);
+
+		file_put_contents(SETTINGS_DIR . '/settings.json', $file_string);
+	}
+
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Magic method to simplify isset checking for config options
+	 *
+	 * @param string $key
+	 * @return mixed
+	 */
+	public function __get($key)
+	{
+		return (isset($this->current->{$key}) && $key != "dbs")
+			? $this->current->{$key}
+			: NULL;
+	}
+
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Magic method to simplify setting config options
+	 *
+	 * @param string $key
+	 * @param mixed
+	 */
+	public function __set($key, $val)
+	{
+		//Don't allow direct db config changes
+		if($key == "dbs")
+		{
+			return FALSE;
+		}
+
+		return $this->current->{$key} = $val;
+	}
+
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Add a database connection
+	 *
+	 * @param string $name
+	 * @param array $params
+	 */
+	public function add_db($name, $params)
+	{
+		// Return on bad data
+		if (empty($name) || empty($params))
+		{
+			return FALSE;
+		}
+
+		if( ! isset($this->current->dbs->{$name}))
+		{
+			$params['name'] = $name;
+
+			$this->current->dbs->{$name} = array();
+			$this->current->dbs->{$name} = $params;
+		}
+		else
+		{
+			return FALSE;
+		}
+
+		// Save the json
+		$this->__destruct();
+	}
+
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Edit a database connection
+	 *
+	 * @param string $name
+	 * @param array $params
+	 */
+	public function edit_db($name, $params)
+	{
+		// Return on bad data
+		if (empty($name) || empty($params))
+		{
+			return FALSE;
+		}
+
+		if (isset($this->current->dbs->{$name}) && ($name === $params['name']))
+		{
+			$this->current->dbs->{$name} = $params;
+		}
+		elseif ($name !== $params['name'])
+		{
+			unset($this->current->dbs->{$name});
+
+			if ( ! isset($this->current->dbs->{$params['name']}))
+			{
+				$this->current->dbs->{$params['name']} = $params;
+			}
+			else
+			{
+				return FALSE;
+			}
+		}
+		else
+		{
+			return FALSE;
+		}
+
+		// Save the json
+		$this->__destruct();
+
+		return TRUE;
+	}
+
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Remove a database connection
+	 *
+	 * @param  string $name
+	 */
+	public function remove_db($name)
+	{
+		if( ! isset($this->current->dbs->{$name}))
+		{
+			return FALSE;
+		}
+
+		// Remove the db name from the object
+		unset($this->current->dbs->{$name});
+
+		// Save the json
+		$this->__destruct();
+	}
+
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Retreive all db connections
+	 *
+	 * @return  array
+	 */
+	public function get_dbs()
+	{
+		return $this->current->dbs;
+	}
+
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Retreive a specific database connection
+	 *
+	 * @param string $name
+	 * @return object
+	 */
+	public function get_db($name)
+	{
+		return (isset($this->current->dbs->{$name}))
+			? $this->current->dbs->{$name}
+			: FALSE;
+	}
+
+}
+// End of settings.php
\ No newline at end of file
diff --git a/sys/db b/sys/db
index 2b0d1c2..121dfd1 160000
--- a/sys/db
+++ b/sys/db
@@ -1 +1 @@
-Subproject commit 2b0d1c207e6016e0fc114096b7900b6dfd01e45d
+Subproject commit 121dfd14014dfaec8b7756c4cf3deac5e37a1c8c
diff --git a/sys/widgets/connection_sidebar.php b/sys/widgets/connection_sidebar.php
index 93d3716..4daf409 100644
--- a/sys/widgets/connection_sidebar.php
+++ b/sys/widgets/connection_sidebar.php
@@ -22,41 +22,41 @@ namespace OpenSQLManager;
  * @subpackage Widgets
  */
 class Connection_Sidebar extends \wxPanel {
-	
+
 	const MENU_CONNECT =  1;
 	const MENU_DISCONNECT = 2;
 	const MENU_EDIT_CONNECT = 3;
-	const MENU_DELETE_CONNECT = 4; 
+	const MENU_DELETE_CONNECT = 4;
 	const BUTTON_ADD = 5;
 
 	/**
 	 * Reference to Settings instance
-	 * 
+	 *
 	 * @var Settings
 	 */
 	protected $settings;
-	
+
 	/**
 	 * Reference to popup menu
-	 * 
+	 *
 	 * @var wxMenu
 	 */
 	protected $menu;
-	
+
 	/**
 	 * Singleton instance
-	 * 
+	 *
 	 * @var Connection_Sidebar
 	 */
 	private static $instance;
-	
+
 	/**
 	 * Name of current db connection
-	 * 
+	 *
 	 * @var string
 	 */
 	private $conn_name;
-	
+
 	/**
 	 * Reference to the list control that holds the connections
 	 *
@@ -92,27 +92,27 @@ class Connection_Sidebar extends \wxPanel {
 	{
 		// Create the frame
 		parent::__construct($parent, 1);
-		
+
 		$this->list = new \wxListCtrl($parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_LIST|wxLC_SINGLE_SEL);
-		$this->settings =& \Settings::get_instance();
-		
+		$this->settings =& Settings::get_instance();
+
 		// Create a button for adding new connections
 		$new_conn = new \wxButton($this, self::BUTTON_ADD, 'New Connection');
 		$new_conn->Connect(wxEVT_COMMAND_BUTTON_CLICKED, array($this, 'add_conn'));
-		
+
 		// Add a sizer
 		$sizer = new \wxBoxSizer(wxVERTICAL);
 		$sizer->add($this->list, 1, wxALL|wxEXPAND);
 		$sizer->add($new_conn, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_BOTTOM|wxEXPAND);
-		
+
 		$this->SetSizer($sizer);
 		$this->Layout();
-		
+
 		$this->Centre(wxBOTH);
 	}
-	
+
 	// --------------------------------------------------------------------------
-	
+
 	/**
 	 * Right-click event to create context menu
 	 *
@@ -127,17 +127,17 @@ class Connection_Sidebar extends \wxPanel {
 			$menu = new \wxMenu();
 			$menu->Append(self::MENU_EDIT_CONNECT, "Edit Connection", "Edit Connection Settings for the selected Database");
 			$menu->Append(self::MENU_DELETE_CONNECT, "Delete Connection", "Remove the selected connection");
-			
+
 			// Wire up the event handler
 			$menu->Connect(wxEVT_COMMAND_MENU_SELECTED, array($this, 'menu_event'));
-			
+
 			// Tell the object to show the menu
 			$this->list->PopupMenu($menu);
 		}
 	}
-	
+
 	// --------------------------------------------------------------------------
-	
+
 	/**
 	 * Handler for context menu options
 	 *
@@ -146,11 +146,11 @@ class Connection_Sidebar extends \wxPanel {
 	 */
 	public function menu_event($event)
 	{
-		
+
 	}
-	
+
 	// --------------------------------------------------------------------------
-	
+
 	/**
 	 * Handles an event for adding a connection
 	 *
diff --git a/sys/widgets/connection_manager.php b/sys/windows/connection_manager.php
similarity index 100%
rename from sys/widgets/connection_manager.php
rename to sys/windows/connection_manager.php
diff --git a/sys/windows/main.php b/sys/windows/main.php
index 6a6c3c5..dc0c98e 100644
--- a/sys/windows/main.php
+++ b/sys/windows/main.php
@@ -27,18 +27,18 @@ class Main extends \wxFrame {
 
 	/**
 	 * Reference to settings instance
-	 * 
+	 *
 	 * @var Settings
 	 */
 	private $settings;
-	
+
 	/**
 	 * Reference to connection sidebar instance
-	 * 
+	 *
 	 * @var Connection_Sidebar
 	 */
 	private $connection_sidebar;
-	
+
 	/**
 	 * Reference to split window
 	 *
@@ -52,13 +52,13 @@ class Main extends \wxFrame {
 	public function __construct()
 	{
 		parent::__construct(NULL, NULL, PROGRAM_NAME, \wxDefaultPosition, new \wxSize(800, 600));
-		
+
 		$this->_create_menu();
-		
+
 		$sbar = $this->CreateStatusBar(2);
 		$sbar->SetStatusText("OpenSQLManager");
-		
-		$this->settings =& \Settings::get_instance();
+
+		$this->settings =& Settings::get_instance();
 
 		// Layout the interface
 		$this->_main_layout();
@@ -85,7 +85,7 @@ class Main extends \wxFrame {
 	 */
 	public function quit()
 	{
-		$this->Destroy();	
+		$this->Destroy();
 	}
 
 	// --------------------------------------------------------------------------
@@ -111,7 +111,7 @@ class Main extends \wxFrame {
 		$dlg->SetDevelopers(array(
 			'Timothy J. Warren',
 		));
-		
+
 		\wxAboutBox($dlg);
 	}
 
@@ -127,23 +127,23 @@ class Main extends \wxFrame {
 	{
 		// Set up the main menu
 		$this->_create_menu();
-		
+
 		// Create a split window
 		$win = new \wxSplitterWindow($this, wxID_ANY, wxDefaultPosition, wxDefaultSize);
 		$win->setSplitMode(wxSPLIT_HORIZONTAL);
-		
-		
+
+
 		// Add the connection sidebar
 		$this->connection_sidebar =& Connection_Sidebar::get_instance($win);
 		$win2 = new Data_Grid($win);
-		
+
 		// Add the widgets to the split window
 		$win->SplitVertically($this->connection_sidebar, $win2);
 		$win->SetSashPosition(200, TRUE);
 
 		// Save a reference for later use
 		$this->split =& $win;
-    	
+
 	}
 
 	// --------------------------------------------------------------------------
diff --git a/tests/index.php b/tests/index.php
index 439a129..afe519f 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -21,6 +21,14 @@ define('OSL_BASE_DIR', str_replace(basename(OSL_TEST_DIR).'/', '', OSL_TEST_DIR)
 
 // --------------------------------------------------------------------------
 
+// Include simpletest
+// it has to be set in your php path, or put in the tests folder
+require_once('simpletest/autorun.php');
+
+// Settings Tests
+require_once(OSL_BASE_DIR . 'common/settings.php');
+require_once(OSL_TEST_DIR . 'settings.php');
+
 // Include db autoloader
 require_once(OSL_BASE_DIR . 'db/autoload.php');
 
diff --git a/tests/settings.php b/tests/settings.php
new file mode 100644
index 0000000..4cdcf2b
--- /dev/null
+++ b/tests/settings.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * OpenSQLManager
+ *
+ * Free Database manager for Open Source Databases
+ *
+ * @author 		Timothy J. Warren
+ * @copyright	Copyright (c) 2012
+ * @link 		https://github.com/aviat4ion/OpenSQLManager
+ * @license 	http://philsturgeon.co.uk/code/dbad-license
+ */
+
+// --------------------------------------------------------------------------
+
+/**
+ * Settings Class Test Class
+ */
+class SettingsTest extends UnitTestCase {
+
+	public function __construct()
+	{
+		parent::__construct();
+		$this->settings =& OpenSQLManager\Settings::get_instance();
+
+		// Make sure to delete 'foo' if it exists
+		$this->settings->remove_db('foo');
+	}
+
+	// --------------------------------------------------------------------------
+
+	public function TestExists()
+	{
+		$this->assertIsA($this->settings, 'OpenSQLManager\Settings');
+	}
+
+	// --------------------------------------------------------------------------
+
+	public function TestGetEmptyDBs()
+	{
+		$this->assertTrue(is_object($this->settings->get_dbs()));
+	}
+
+	// --------------------------------------------------------------------------
+
+	public function TestGetNull()
+	{
+		$this->assertFalse(isset($this->settings->foo));
+	}
+
+	// --------------------------------------------------------------------------
+
+	public function TestSet()
+	{
+		$bar = $this->settings->foo = 'bar';
+
+		$this->assertEqual('bar', $bar);
+	}
+
+	// --------------------------------------------------------------------------
+
+	public function TestGet()
+	{
+		$this->assertEqual('bar', $this->settings->foo);
+	}
+
+	// --------------------------------------------------------------------------
+
+	public function TestSetDBProperty()
+	{
+		$res = $this->settings->__set('dbs', 2);
+		$this->assertFalse($res);
+	}
+
+	// --------------------------------------------------------------------------
+
+	public function TestGetEmptyDB()
+	{
+		$this->assertFalse($this->settings->get_db('foo'));
+	}
+
+	// --------------------------------------------------------------------------
+
+	public function TestAddDB()
+	{
+		$this->settings->add_db('foo', array());
+
+		$db = $this->settings->get_db('foo');
+
+		$this->assertTrue(isset($db));
+	}
+}