Moving more stuff to OOXMLObject