basic user watching ability
removed junk file mark was using
merge with Andy's auth commit