WPF version working. Some minor changes to Model.