add todo for how to handle expressiontoken