Final Commit

Last commit for WPF!!! What a month!