add Token data structure. Switch to dotall regex