Rewrite of code in WPF using new project. Keeping as a branch for the moment until I make sure there's nothing to recycle.