Merging Changes from Bluenose
MESSY merge of files from svn and non version control
Maybe someday I'll clean it up a little