Sign in almost done
Merging