Added first attempt at upload support