Refactoring
Added vertex membership calculation
Added vertex index calculation to calculation
Stage work before going home