Updated multiple user functionality, lots of comments and needs some work