major code over-haul & dual password prompts