More work on dropbox-style functionality