Tons of commits to logon branch. Everything still in beta