Changed grid loading to use setup and simply swap the pieces to their correct position. The invalid grid bug is still not fixed