First commit
Merge https://github.com/randomsilver/simplegridtest