Signout working but feels hacky