Code Cleanup
Continue fleshing out login