Submitting partial commit - this MIGHT help solve the modal / upload form conflict