More upload tweaking, now with database uploads!