Starting to get some kind of framework in place for MVVM