Log in screen builds, still needs cleanup.
Merge