HELP: Look at todos. Receiving end for username is still not good.

The query is still not perfect. Search for the TODOs for documentation.