Added core data classes ( needs interfaces to compile - working on these )