Reworked the architecture, added get-row, get-column