Change leaver status to using an enum again, seems to be holding up in small tests