add support for choosing both folders and account for uploads