whole bunch of changes after consolidating from dropbox