Did a little expedient re-factoring on SquareOctagonLattice