added TODOs to user module