Some changes to the builder (refactored into one class) and some work on file uploading.