This is a WIP, added in for expecting password