Got basic login working
Merge