Started converting Proto1 tp MVVM/global refactor