Text Upload 3 with proper(?) diff/master thingy?