Small reorganization of the model + services assembly. Also wrote most of the WPF front-end.