Updated ALL classes to a working project