First commit
Review current test and redefine the grid