Upload kinda working
Fixed merge issues