Refactoring, stargin with CoreData.