more structuring

integrating login