start of coredata refactor for SPV