Added signup and more