Final commit

Login working