Grid nearly complete, working properly now