big commit after getting rev 12 token working.  still a lot to do