Added core data functionality - still bugs though
Core data