adding missing classes
more changes needed to compile