Some progress on incrementing token_ptr