Jeff, this is the outfit you are looking for, from Hobby Horse.
Also available here.
Do yourself a favor and get this to go with it.
Find the different sizes of rivets (eyelets) by doing this.
Yes, I know, it's expensive. About one locomotive worth. I agonized long and hard before doing it, and I have congratulated myself ever since. Professional toy train riveting, nothing else can touch it. It is so great to be able to do it right. The tool also is ideal for pressing out bearings, wheels onto axles, and so on… (also for pressing out the old rivets, much better than trying to drill them out!) If you tinker with trains, you will use it constantly.
david