Merging code with Hidi -- login