Added basic grid implementation