#26 WIP added some code for grouping locks by primary row/col