Final upload working and passes tests