Commented rest of classes for explicit patching. see #3