Upate TODO
Fix bug with ambiguity between token User and User - don't default user to token user