Docmaker mostly functional, still some clean up to do