Further changes to the structure and use of the program. Still very much a work in progress.