added comma and loop to scanner. built out 'token' section of parser