crypto-square - refactor wip