Added password promt and moved some variables around