Feature/0.8 better uploads