Here's the fix.... Assign a shop foreman (experienced dcs user) with his own remote who get the engines ready to leave the shop on the outbound shop track. He now hands over the engine to a club member . ID to same ID. He's also responsible for putting engine away when they arrive.
Barry where do you get the T-shirt?
