Work in progress.
Good working copy.
Changes relating to post 4
Changes relating to post 5