Two new classes created and some comments updated.