Added some stuff to handle second user. Half way there.