Lots of progress on exportClass, but work still needed.