Classes are now setup and functioning properly