REVIEW: Change to end of transaction

Changes the end of a transaction by making the "upload to server" task a separate call.