Finishing touches on CSV upload PR