token numbering seems to work
new pass
perhaps I have added automake support for the new file, perhaps, not;
seems simple enough...
just some work on the driver