Pre-subway parser update

Its sandwich time. Also, we have some ability to parse txt int tokens.