fix class definitions , still working on overide ...