added back location watching, renamed users to auth