During refactoring this feature was broken, rendering uploads
impossible, this reimplements the feature correctly and separates it
into it's own function