start work on auto insert and pass-through tokens