Login Works
Small Update
Merge