working on login
merging test work