One Token for everything is a good idea.

I think leoCUB was a mistake, and I'm glad you're doing it this way now.