Adding a huge update that includes all the latest changes put into svn over the last several months