David

Candidate branch to merge with main trunk as a base for further development. Some notes added in email to Bill on changes.