Major rework of the major rework :-(
Still a work in progress :-(((

git-svn-id: https://etee.svn.codeplex.com/svn@29564 555e8bc2-ad3d-4a22-a156-a42dcab9bd6f