Moved upload to views.
Resolved merge conflicts.