login logic slowly hooking up yo
merged yo