Added basic grid functionality