Fixing the class addition.
Adding comment every now and than.