still working
Merge branch 'ej_db' into ej_login