WIP refactor findMember
WIP