Seperated upload functionality into library to close #6