Added most recent work from legacy SVN repo.
Added most recent work from legacy SVN repo.