revert Grid.hpp back to the one almost 100%