finished deferred refactoring, now writing simple collection view