Added a couple lines of code and a new class.