Probably better way to parse tok.c
Bunch of changes, might not be working