First code merge

excludes sign in, create account, and password generator. flow control
requires update.