- Rewrite document class to make a little more sense