more work in progress
GUI-1211
uploading works