rework datamodel again.  Put UserSiteWaitData back into UserSite repo