WPF Replacement Commit

Use this for WPF GUI