Continued on WPF GUI