Start on fixing up docx generator