started core data refactor