Bug fix and HexMasks work in progress