removed hard coded 12 and using -grid-num-columns
Set up so you can optionally test 16 column grids (leaving it to default to 12 columns)