Big refactor, only allow one upload per request, routine on upload