Update TODO - consider OpenID?