working on signin
fixed merge conflicts, first signin attempt