Dunno if its been suggested before but how about a separate warehouse just for storing leaders ?