Still cleaning up — adding comments, Wpf controls, separating concerns etc.