2011-11-06  Byron Ruth  <b@devel.io>

	* Refactor and clean up of original code base originally designed
	and written by James Bennett.
