Initial XHTML export using new methods

Change-Id: I8fa8ebedb074bdf97023e6cdd4b141e1624bc633