Continued work on WPF GUI