More work on sign in, data models