Started working on some sign-on related logic