starting to merge over from dropbox; this will be primary