First small baby steps back into MVVM