Singly login working
Stuff working
Merge branch 'brian'