Feature 60 updated

it is generally working, but there is still a problem with the download
functionality