Refactored to reflect dropbox concepts