Updated for Xcode beta-7 and started moving to MVVM