Added the ability to have multiple users