Extended tomdoc

It isn't all there, but it's getting closer.