initial work on the authentication and porting to the new image options