Add login
Merge branch 'refactoring'