Refactor uploads

we should've merged this branch into development a long time ago. We should be branching off of development and not the refactor_uploads branch