reorganizing, got uploads working