Added in the changes Stephen has made 
Mainly removing the Password prompt on startup