More code and a new class