A proper stab at assembling files in staging