Started shift to global state class to maintain session info