Simplify lexer, rebuild
Add in raw token
Pass in raw strings and args
Fix that escape problem