merges
got things working with the login, logout, and redirects