refactor membership stuff, bring back in old admin pieces