Update/revamp membership system to 9 types