More MVVM work. What a trudge. Starting to rethink the pattern too. Hoo boy.