added awesome core data functionality!
merge issue