Adding the classes that really don't work as intended but make other things compile...