Two years later, I'd like to know you managed everything at the end Dale. Im about to make a project with compositional layout, diffable datasource and core data.