Added ability to specify the number of columns/rows we want