BROKEN: Classes are handled, spec is fixed.