More changes.
Seems to at least give decent information, and can be used to stub out the rest of the functionality, or edited as needed.