About to try sub-doc
Restructured, now looking good