Added the login stuff, add promotion working also
Fixing merge