Refactored uploads, broken crop
Fixed crop