Adding WPF Project refactor
moving brach to latest