Add simple math
Add multi-token on same line support