re-jigging the controls a bit
Adding a viewmodel for the main window.
Also, annotations.cs to presumably make resharper happy