Work on document class (in progress)