functionality all added, can be cleaned up. I seem to have a bug when a second user is added