I do the sandwich bags and sharpie. But when I sent everything out for re-plating I did this.
I grouped every thing together for different parts and then used pictures to regroup them for assembly. The parts came back all shuffled together in one box.