Working on WPF
Merged